diff --git a/apps/maarch_entreprise/class/class_business_app_tools.php b/apps/maarch_entreprise/class/class_business_app_tools.php
index 51d2a043f007c6136d1eb62e5c98faec3896306d..f0c7d53948d44f4388de804455ea479b22d81ba9 100644
--- a/apps/maarch_entreprise/class/class_business_app_tools.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools.php
@@ -101,6 +101,7 @@ class business_app_tools extends business_app_tools_Abstract
$_SESSION['attachment_types_with_chrono'] = array();
$_SESSION['attachment_types_show'] = array();
$_SESSION['attachment_types_with_process'] = array();
+ $_SESSION['attachment_types_with_delay'] = array();
$attachmentTypes = $xmlfile->attachment_types;
if (count($attachmentTypes) > 0) {
foreach ($attachmentTypes->type as $type ) {
@@ -109,6 +110,7 @@ class business_app_tools extends business_app_tools_Abstract
$get_chrono = (string) $type['get_chrono'];
$attach_in_mail = (string) $type['attach_in_mail'];
$show_attachment_type = (string) $type['show'];
+ $delay = (string) $type['with_delay'];
$process = (string) $type->process_mode;
if (!empty($label) && defined($label)
&& constant($label) <> NULL
@@ -123,6 +125,7 @@ class business_app_tools extends business_app_tools_Abstract
$_SESSION['attachment_types_get_chrono'][(string) $type->id] = $array_get_chrono;
$_SESSION['attachment_types_attach_in_mail'][(string) $type->id] = $attach_in_mail;
$_SESSION['attachment_types_with_process'][(string) $type->id] = $process;
+ $_SESSION['attachment_types_with_delay'][(string) $type->id] = $delay;
}
}
@@ -181,4 +184,4 @@ class business_app_tools extends business_app_tools_Abstract
}
-}
\ No newline at end of file
+}
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index e498ea56e4351cc65a8525eb8290ea6ed100af2f..6b5cb4a50a80ca2a3e021b365e2239dff8b64b97 100644
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -637,8 +637,11 @@ if ((!empty($_SESSION['error']) && ! ($_SESSION['indexation'] )) )
<th align="left" class="picto" >
<?php
if (isset($data[$key]['addon'])) {
- echo $data[$key]['addon'];
- //$detailsExport .= $data[$key]['addon'];
+ if(in_array($key, ['dest_user_id', 'exp_user_id', 'dest_contact_id', 'exp_contact_id'])){
+ echo $data[$key]['addon_detail'];
+ } else {
+ echo $data[$key]['addon'];
+ }
} elseif (isset($data[$key]['img'])) {
//$detailsExport .= "<img alt='".$data[$key]['label']."' title='".$data[$key]['label']."' src='".$data[$key]['img']."' />";
if ($folder_id <> "") {
@@ -1240,11 +1243,7 @@ if ((!empty($_SESSION['error']) && ! ($_SESSION['indexation'] )) )
$pathScriptTab = $_SESSION['config']['businessappurl']
. 'index.php?display=true&page=show_visa_tab&module=visa&resId='.$s_id.'&collId='.$coll_id.'&destination='.$destination.'&fromDetail=true';
$visa_frame .= '<dt id="visa_tab" class="fa fa-certificate" style="font-size:2em;padding-left: 15px;';
- // if(strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome')){
- // $visa_frame .= 'padding-right: 0px;';
- // }else{
- // $visa_frame .= 'padding-right: 15px;';
- // }
+
$visa_frame .='padding-right: 15px;" title="'._VISA_WORKFLOW.'" onclick="loadSpecificTab(\'visa_iframe\',\''.$pathScriptTab.'\');return false;"> <sup id="visa_tab_badge"></sup></dt><dd id="page_circuit" style="overflow-x: hidden;">';
$visa_frame .= '<h2>'._VISA_WORKFLOW.'</h2>';
$visa_frame .= '<iframe src="" name="visa_iframe" width="100%" align="left" scrolling="yes" frameborder="0" id="visa_iframe" style="height:95%;"></iframe>';
diff --git a/apps/maarch_entreprise/tools/phpids/lib/IDS/maarch_filter.xml b/apps/maarch_entreprise/tools/phpids/lib/IDS/maarch_filter.xml
index baabb1b2d12edadfe7ee28d677513cbac970c2f6..6518afca4e1ac72f8286e4fde91eccfdfd499169 100755
--- a/apps/maarch_entreprise/tools/phpids/lib/IDS/maarch_filter.xml
+++ b/apps/maarch_entreprise/tools/phpids/lib/IDS/maarch_filter.xml
@@ -313,7 +313,7 @@
</tags>
<impact>4</impact>
</filter>
- <filter>
+<!-- <filter>
<id>30</id>
<rule><![CDATA[(?:=\s*\w+\s*\+\s*")|(?:\+=\s*\(\s")|(?:!+\s*[\d.,]+\w?\d*\s*\?)|(?:=\s*\[s*\])|(?:"\s*\+\s*")|(?:[^\s]\[\s*\d+\s*\]\s*[;+])|(?:"\s*[&|]+\s*")|(?:\/\s*\?\s*")|(?:\/\s*\)\s*\[)|(?:\d\?.+:\d)|(?:]\s*\[\W*\w)|(?:[^\s]\s*=\s*\/)]]></rule>
<description>Detects common XSS concatenation patterns 1/2</description>
@@ -324,7 +324,7 @@
<tag>rfe</tag>
</tags>
<impact>4</impact>
- </filter>
+ </filter> -->
<filter>
<id>31</id>
<rule><![CDATA[(?:=\s*\d*\.\d*\?\d*\.\d*)|(?:[|&]{2,}\s*")|(?:!\d+\.\d*\?")|(?:\/:[\w.]+,)|(?:=[\d\W\s]*\[[^]]+\])|(?:\?\w+:\w+)]]></rule>
diff --git a/apps/maarch_entreprise/xml/entreprise.xml b/apps/maarch_entreprise/xml/entreprise.xml
index 558957c63db4cd65c8714976e1485928eb1eb451..c36a1746fb874452413fdbf388ca415ba42e57d7 100644
--- a/apps/maarch_entreprise/xml/entreprise.xml
+++ b/apps/maarch_entreprise/xml/entreprise.xml
@@ -41,7 +41,7 @@
<label>_RESPONSE_PROJECT</label>
<process_mode></process_mode>
</type>
- <type show="true" with_chrono="true" icon="fa-paper-plane-o" sign="false">
+ <type show="true" with_chrono="true" with_delay="60" icon="fa-paper-plane-o" sign="false">
<id>transmission</id>
<label>Transmission</label>
<process_mode></process_mode>
diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php
index e7968d257877c114779a238fb74195c0f63b9295..ed3e1cb9dc09ba6c60988fa4277c5511f0625e92 100644
--- a/modules/attachments/attachments_content.php
+++ b/modules/attachments/attachments_content.php
@@ -1720,6 +1720,9 @@ if (!isset($_REQUEST['id'])) {
if(empty($_SESSION['attachment_types_get_chrono'][$attachmentType][0])){
$_SESSION['attachment_types_get_chrono'][$attachmentType] = '';
}
+ if(empty($_SESSION['attachment_types_with_delay'][$attachmentType][0])){
+ $_SESSION['attachment_types_with_delay'][$attachmentType] = '';
+ }
if($_SESSION['attachment_types_show'][$attachmentType] == "true"){
$content .= '<option value="' . $attachmentType . '" with_chrono = "'. $_SESSION['attachment_types_with_chrono'][$attachmentType].'" get_chrono = "'. $_SESSION['attachment_types_get_chrono'][$attachmentType].'"';
@@ -1803,6 +1806,7 @@ if (isset($_REQUEST['id'])) {
} else {
$content .= '<input type="text" name="back_date" id="back_date" onClick="showCalender(this);" onfocus="checkBackDate(this)" value="" />';
}
+$content .= "<input type='hidden' name='withDelay' id='withDelay' value='".$_SESSION['attachment_types_with_delay']['transmission']."' />";
$content .= "<input type='hidden' name='dataCreationDate' id='dataCreationDate' value='{$dataForDate->creation_date}' />";
$content .= '</p>';
$content .= '<div>';
diff --git a/modules/attachments/js/functions.js b/modules/attachments/js/functions.js
index 6d410e57ba044918910d3e16188bb82c8d98f207..06afae4a4a8f95cfad786e5859305a06ec7d3526 100644
--- a/modules/attachments/js/functions.js
+++ b/modules/attachments/js/functions.js
@@ -1,3 +1,23 @@
+// Date + 60 jours, utile pour les transmissions
+function defineBackDate() {
+ var delay;
+ var date1 = new Date();
+ delay = $('withDelay').value
+ date1.setDate(date1.getDate() + Number(delay));
+ var str_date = date1.toLocaleDateString();
+ str_date = str_date.replace(/\//g, '-');
+ return str_date;
+}
+
+function showOrButtonForAttachment() {
+ if ($("edit").style.display != "none" && $("newTransmissionButton0").style.display != "none") {
+ $("divOr0").style.display = "";
+ } else {
+ $("divOr0").style.display = "none";
+ }
+}
+
+
function checkBackDate(inputDate) {
var dataCreationDate;
@@ -173,6 +193,7 @@ function addNewTransmission(prePath, docId, canCreateContact, langString, user)
"</p>" +
"<p>" +
"<label>" + "Date de retour attendue" + "</label>" +
+ "<input type='hidden' name='withDelay" + size + "' id='withDelay" + size + "' value='' style='width: 75px' />" +
"<input type='text' name='transmissionBackDate" + size + "' id='transmissionBackDate" + size + "' onClick='showCalender(this);' onfocus='checkBackDate(this)' value='' style='width: 75px' />" +
"<select name='transmissionExpectedDate" + size + "' id='transmissionExpectedDate" + size + "' style='margin-left: 20px;width: 105px' />" +
"<option value='EXP_RTURN'>Attente retour</option>" +
@@ -222,6 +243,7 @@ function addNewTransmission(prePath, docId, canCreateContact, langString, user)
$('transmissionChrono' + size).value = $('chrono').value + "." + String.fromCharCode(64 + size);
$('DisTransmissionChrono' + size).value = $('chrono').value + "." + String.fromCharCode(64 + size);
$('transmissionTitle' + size).value = $('title').value;
+ $('transmissionBackDate' + size).value = defineBackDate();
getTemplatesForSelect((prePath + "index.php?display=true&module=templates&page=select_templates"), "transmission", "transmissionTemplate" + size);
launch_autocompleter_contacts_v2(prePath + "index.php?display=true&dir=indexing_searching&page=autocomplete_contacts", "transmissionContact_attach" + size, "transmission_show_contacts_attach" + size, "", "transmissionContactidAttach" + size, "transmissionAddressidAttach" + size)
}
diff --git a/modules/sendmail/batch/logs/.gitkeep b/modules/sendmail/batch/logs/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/modules/visa/lang/fr.php b/modules/visa/lang/fr.php
index e31c1635a99d8b983397db33dc9844a3a59178d5..83ef6f9fafb70b7b6b6a99e060300d182e1ad8cd 100644
--- a/modules/visa/lang/fr.php
+++ b/modules/visa/lang/fr.php
@@ -86,7 +86,7 @@ if (!defined("_VISA_BY"))
define("_VISA_BY", "Visa par");
if (!defined("_INSTEAD_OF"))
- define("_INSTEAD_OF", "A la place de");
+ define("_INSTEAD_OF", "Ã la place de");
if (!defined("_CONFIG_VISA_WORKFLOW_IN_DETAIL"))
define("_CONFIG_VISA_WORKFLOW_IN_DETAIL", "Configuration du circuit de visa depuis la fiche détaillée");
diff --git a/modules/visa/updateVisaWF.php b/modules/visa/updateVisaWF.php
index ce9d1ed4a2e39a7337be919b0567cfd16a43963c..427d699c535fb888bf32135853f3445b81b05121 100644
--- a/modules/visa/updateVisaWF.php
+++ b/modules/visa/updateVisaWF.php
@@ -74,6 +74,7 @@ if($userList){
}
$visa->saveWorkflow($res_id, $coll_id, $_SESSION['visa_wf']['diff_list'], 'VISA_CIRCUIT');
+$visa->setStatusVisa($res_id, $coll_id);
//LOAD TOOLBAR BADGE
$toolbarBagde_script = $_SESSION['config']['businessappurl'] . 'index.php?display=true&module=visa&page=load_toolbar_visa&origin=parent&resId=' . $res_id . '&collId=' . $coll_id;