diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php
index 9117e5844a14955c8a30e3fb09bd7ceed38749d7..57a307ce7c557e9be8089cff42d59c86663ca451 100755
--- a/apps/maarch_entreprise/actions/process.php
+++ b/apps/maarch_entreprise/actions/process.php
@@ -325,7 +325,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '</tr>';
}
}
- if ($chrono_number != '') {
+ if ($chrono_number != '' && _ID_TO_DISPLAY == 'res_id') {
$frm_str .= '<tr>';
$frm_str .= '<td width="50%" align="left"><span class="form_title_process">'
._CHRONO_NUMBER.' :</span></td>';
diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php
index 5da490bcac9bfdf976f1954c2257119b20cf2ab5..d420284e796846f852c14273464157af7e0a6462 100755
--- a/apps/maarch_entreprise/actions/validate_mail.php
+++ b/apps/maarch_entreprise/actions/validate_mail.php
@@ -183,7 +183,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$allEntitiesTree = $ent->getShortEntityTreeAdvanced(
$allEntitiesTree, 'all', '', $EntitiesIdExclusion, 'all'
);
- //echo "HELLO";
+
//diffusion list in this basket ?
if ($_SESSION['current_basket']['difflist_type'] == 'entity_id') {
$target_model = 'document.getElementById(\'destination\').options[document.getElementById(\'destination\').selectedIndex]';
@@ -588,9 +588,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '<td class="indexing_field"><input type="radio" name="type_contact" id="type_contact_internal" value="internal" class="check" onclick="clear_error(\'frm_error_'.$id_action.'\');change_contact_type(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=autocomplete_contacts\', false);update_contact_type_session(\''
.$_SESSION['config']['businessappurl']
.'index.php?display=true&dir=indexing_searching&page=autocomplete_contacts_prepare_multi\');reset_check_date_exp();"';
- if ($data['type_contact'] == 'internal') {
- $frm_str .= ' checked="checked" ';
- }
+
$frm_str .= ' /><label for="type_contact_internal">'._INTERNAL2.'</label></td></tr>';
$frm_str .= '<tr id="contact_choose_2_tr" style="display:'.$display_value.';">';
@@ -654,11 +652,9 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$frm_str .= '<td class="indexing_field">';
if ($data['type_contact'] == 'internal') {
- //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;color:#135F7F;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
//MODIF:
$frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_contact_internal_icon" onclick="$j(\'#type_contact_internal\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_internal_icon\').css(\'color\', \'#135F7F\');$j(\'#type_multi_contact_internal_icon\').css(\'color\', \'#666\');"></i>';
} elseif ($data['type_contact'] == 'external') {
- //$frm_str .= '<i class="fa fa-user" title="'._INTERNAL2.'" style="cursor:pointer;" id="type_contact_internal_icon" onclick="$$(\'#type_contact_internal\')[0].click();$(\'type_contact_internal_icon\').setStyle({color: \'#135F7F\'});$(\'type_contact_external_icon\').setStyle({color: \'#666\'});$(\'type_multi_contact_external_icon\').setStyle({color: \'#666\'});"></i>';
//MODIF:
$frm_str .= ' <i class="fa fa-user" title="'._SINGLE_CONTACT.'" style="cursor:pointer;color:#135F7F;" id="type_contact_external_icon" onclick="$j(\'#type_contact_external\')[0].click();$j(\'#type_contact_internal_icon\').css(\'color\', \'#666\');$j(\'#type_contact_external_icon\').css(\'color\', \'#135F7F\');$j(\'#type_multi_contact_external_icon\').css(\'color\', \'#666\');"></i>';
}
diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php
index e5a51695da91f165e265cea2767fa23dcf70fea1..3136cb5ecd71e69c0f80558ecddd32e9e5693362 100755
--- a/apps/maarch_entreprise/indexing_searching/details.php
+++ b/apps/maarch_entreprise/indexing_searching/details.php
@@ -517,7 +517,7 @@ if ($stmt->rowCount() == 0) {
//ATTACHMENTS TAB
if ($core->is_module_loaded('attachments')) {
$attachments_frame = '';
- $extraParam = '&attach_type_exclude=response_project,signed_response,outgoing_mail_signed,converted_pdf,outgoing_mail,print_folder';
+ $extraParam = '&attach_type_exclude=response_project,signed_response,outgoing_mail_signed,converted_pdf,outgoing_mail,print_folder,aihp';
$pathScriptTab = $_SESSION['config']['businessappurl']
.'index.php?display=true&page=show_attachments_details_tab&module=attachments&resId='
.$s_id.'&collId='.$coll_id.'&fromDetail=attachments'.$extraParam;
@@ -534,7 +534,7 @@ if ($stmt->rowCount() == 0) {
//RESPONSES TAB
if ($core->is_module_loaded('attachments')) {
$responses_frame = '';
- $extraParam = '&attach_type=response_project,outgoing_mail_signed,signed_response,outgoing_mail';
+ $extraParam = '&attach_type=response_project,outgoing_mail_signed,signed_response,outgoing_mail,aihp';
$pathScriptTab = $_SESSION['config']['businessappurl']
.'index.php?display=true&page=show_attachments_details_tab&module=attachments&fromDetail=response&resId='
.$s_id.'&collId='.$coll_id.$extraParam;
@@ -929,15 +929,17 @@ if ($stmt->rowCount() == 0) {
echo '</td>';
//CHRONO NUMBER
- echo '<th align="left" class="picto">';
- echo '<i class="fa fa-compass fa-2x" title="'._CHRONO_NUMBER.'" ></i>';
- echo '</th>';
- echo '<td align="left" width="200px">';
- echo _CHRONO_NUMBER;
- echo '</td>';
- echo '<td>';
- echo "<input type='text' class='readonly' readonly='readonly' value='{$chrono_number}' title='{$chrono_number}' alt='{$chrono_number}' size='40'";
- echo '</td>';
+ if (_ID_TO_DISPLAY == 'res_id') {
+ echo '<th align="left" class="picto">';
+ echo '<i class="fa fa-compass fa-2x" title="'._CHRONO_NUMBER.'" ></i>';
+ echo '</th>';
+ echo '<td align="left" width="200px">';
+ echo _CHRONO_NUMBER;
+ echo '</td>';
+ echo '<td>';
+ echo "<input type='text' class='readonly' readonly='readonly' value='{$chrono_number}' title='{$chrono_number}' alt='{$chrono_number}' size='40'";
+ echo '</td>';
+ }
echo '</tr>';
//OTHER DATAS INITIATOR, TYPIST
diff --git a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
index ffc67742d106c1f86420332ab1138f97c5b478ad..2a42352bdbcd8014d5b3c9fcca2b49951cb7a655 100755
--- a/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/documents_list_mlb_search_adv.php
@@ -434,17 +434,18 @@ if ($mode == 'normal') {
$tab[$i][$j]['res_multi_contacts'] = $_SESSION['mlb_search_current_res_id'];
}
if ($tab[$i][$j][$value] == 'alt_identifier') {
- $tab[$i][$j]['value'] = $tab[$i][$j]['value'];
- $tab[$i][$j]['label'] = _CHRONO_NUMBER;
+ $target_chrono = $_SESSION['searching']['where_request_parameters'][':chrono'];
+ $target_chrono = str_replace('%', '', $target_chrono);
+ $chrono = $tab[$i][$j]['value'];
+ $chrono = str_replace($target_chrono, '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$target_chrono.'</i>', $chrono);
+ $tab[$i][$j]['res_id'] = $tab[$i][$j]['value'];
+ $tab[$i][$j]['label']=_CHRONO_NUMBER;
+ $tab[$i][$j]['value'] = $chrono;
$tab[$i][$j]['size'] = '10';
$tab[$i][$j]['label_align'] = 'left';
$tab[$i][$j]['align'] = 'left';
$tab[$i][$j]['valign'] = 'bottom';
- if ($_REQUEST['mode'] == 'popup') {
- $tab[$i][$j]['show'] = true;
- } else {
- $tab[$i][$j]['show'] = false;
- }
+ $tab[$i][$j]['show'] = true;
$tab[$i][$j]['order'] = 'alt_identifier';
}
if ($tab[$i][$j][$value] == 'type_label') {
@@ -597,6 +598,10 @@ if ($mode == 'normal') {
}
$priority = $fakeId;
+ if(!empty($_SESSION['searching']['where_request_parameters'][':priority'])){
+
+ $priority = '<i style="background: #009dc5 none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$_SESSION['mail_priorities'][$fakeId].'</i>';
+ }
$tab[$i][$j]['value'] = $_SESSION['mail_priorities'][$fakeId];
$tab[$i][$j]['label'] = _PRIORITY;
$tab[$i][$j]['size'] = '10';
@@ -608,9 +613,24 @@ if ($mode == 'normal') {
}
if ($tab[$i][$j][$value] == 'dest_user') {
- $tab[$i][$j]['label'] = 'dest_user';
- $tab[$i][$j]['size'] = '10';
+ if(!empty($_SESSION['searching']['where_request_parameters'][':destinataireChosen'])){
+ foreach ($_SESSION['searching']['where_request_parameters'][':destinataireChosen'] as $key => $value) {
+ if($value == $tab[$i][$j]['value']){
+ $target_dest = $value;
+ $target_dest = str_replace('%', '', $target_dest);
+ $dest = $tab[$i][$j]['value'];
+ $dest = str_replace($target_dest, '<i style="background: #135F7F none repeat scroll 0 0;border-radius: 4px;color: white;padding: 3px;" title="mot cible">'.$target_dest.'</i>', $dest);
+ break;
+ }
+ }
+ }else{
+ $dest = $tab[$i][$j]['value'];
+ }
+
+ $tab[$i][$j]["label"]=_DEST_USER;
+ $tab[$i][$j]["size"]="10";
$tab[$i][$j]['label_align'] = 'left';
+ $tab[$i][$j]["value"]=$dest;
$tab[$i][$j]['align'] = 'left';
$tab[$i][$j]['valign'] = 'bottom';
$tab[$i][$j]['show'] = false;
diff --git a/apps/maarch_entreprise/indexing_searching/search_adv.php b/apps/maarch_entreprise/indexing_searching/search_adv.php
index 8ca2ee1b28fa037c595940870f307ef0bc70c0a7..65886b504ebaefed3593ea7649013d04ac6e8f48 100755
--- a/apps/maarch_entreprise/indexing_searching/search_adv.php
+++ b/apps/maarch_entreprise/indexing_searching/search_adv.php
@@ -282,10 +282,10 @@ if ($core_tools->is_module_loaded('entities')) {
$param['destination_mu'] = array('label' => _DESTINATION_SEARCH, 'type' => 'select_multiple', 'param' => array('field_label' => _DESTINATION_SEARCH, 'label_title' => _CHOOSE_ENTITES_SEARCH_TITLE,
'id' => 'services', 'options' => $arr_tmp, ));
-
- $stmt = $conn->query('SELECT DISTINCT '.$table.'.initiator, e.short_label FROM '.$table.' join '.$_SESSION['tablename']['ent_entities'].' e on e.entity_id = '.$table.'.initiator
- '.$where.' group by e.short_label, '.$table.'.initiator order by e.short_label');
//Initiator
+ $stmt = $conn->query("SELECT DISTINCT ".$table.".initiator, e.short_label FROM ".$table." join ".$_SESSION['tablename']['ent_entities']." e on e.entity_id = ".$table.".initiator
+ ".$where." group by e.short_label, ".$table.".initiator order by e.short_label");
+
$arr_tmp = array();
while ($res = $stmt->fetchObject()) {
array_push($arr_tmp, array('VALUE' => $res->initiator, 'LABEL' => $res->short_label));
@@ -531,7 +531,7 @@ if (isset($_REQUEST['nodetails'])) {
<input type="hidden" name="meta[]" value="baskets_clause#baskets_clause#select_simple" />
<select name="baskets_clause" id="baskets_clause">
<option id="true" value="true"><?php echo _ALL_BASKETS; ?></option>
- <option id="false" value="false"><?php echo _NO; ?></option>
+ <!-- <option id="false" value="false"><?php echo _NO;?></option> -->
<?php
if ($_REQUEST['mode'] != 'popup') {
for ($i = 0; $i < count($_SESSION['user']['baskets']); ++$i) {
@@ -544,9 +544,12 @@ if (isset($_REQUEST['nodetails'])) {
&& $_SESSION['user']['baskets'][$i]['id'] != 'QualificationBasket'
) {
?><option id="<?php
- functions::xecho($_SESSION['user']['baskets'][$i]['id']); ?>" value="<?php
- functions::xecho($_SESSION['user']['baskets'][$i]['id']); ?>" ><?php
- functions::xecho($_SESSION['user']['baskets'][$i]['desc']); ?></option>
+ functions::xecho($_SESSION['user']['baskets'][$i]['id']);
+ ?>" value="<?php
+ functions::xecho($_SESSION['user']['baskets'][$i]['id']);
+ ?>" >[<?php echo _BASKET ;?>] <?php
+ functions::xecho($_SESSION['user']['baskets'][$i]['desc']);
+ ?></option>
<?php
}
}
diff --git a/apps/maarch_entreprise/lang/en.php b/apps/maarch_entreprise/lang/en.php
index 47bac8df63bd5e7de731a872a58d2ef92fe40d9d..1be261b3ec2d62ad2a17d8a4c864d36a37e1a0d0 100755
--- a/apps/maarch_entreprise/lang/en.php
+++ b/apps/maarch_entreprise/lang/en.php
@@ -618,7 +618,7 @@ if (!defined('_SEARCH_SCOPE')) {
define('_SEARCH_SCOPE', 'Search impact');
}
if (!defined('_SEARCH_SCOPE_HELP')) {
- define('_SEARCH_SCOPE_HELP', 'Expand the search to baskets; authorizes the actions if a specific basket is selected');
+ define('_SEARCH_SCOPE_HELP', 'The scope corresponds to mails visible by my group or in my baskets');
}
if (!defined('_RESULTS')) {
define('_RESULTS', 'Result(s)');
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 432c9a4def10ae020e7591d1830a6a48b4303483..27d7144983582e064ddac04a8f5c5b6ac1e6bcb6 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -613,7 +613,7 @@ if (!defined('_SEARCH_SCOPE')) {
define('_SEARCH_SCOPE', 'Portée de la recherche');
}
if (!defined('_SEARCH_SCOPE_HELP')) {
- define('_SEARCH_SCOPE_HELP', 'Etend la recherche aux bannettes; autorise les actions si une bannette particulière est sélectionnée');
+ define('_SEARCH_SCOPE_HELP', 'Le périmètre correspond aux courriers visibles par mon groupe ou dans mes bannettes');
}
if (!defined('_RESULTS')) {
define('_RESULTS', 'Résultat(s)');
diff --git a/apps/maarch_entreprise/my_contacts/create_contact_iframe.php b/apps/maarch_entreprise/my_contacts/create_contact_iframe.php
index 36955490fcc3d4b6cffdc552955ebf4bec0cadb4..14102a48c0a1ee6df35405d471085b3ddc7b5abd 100755
--- a/apps/maarch_entreprise/my_contacts/create_contact_iframe.php
+++ b/apps/maarch_entreprise/my_contacts/create_contact_iframe.php
@@ -76,10 +76,12 @@ if ($_SESSION['AttachmentContact'] == "1") {
$createContactDiv = "show_tab";
}
-if (isset($_GET['created']) && $_GET['created'] <> '') { ?>
- <script type="text/javascript">
- set_new_contact_address("<?php echo $_SESSION['config']['businessappurl'] . 'index.php?display=false&dir=my_contacts&page=get_last_contact_address';?>", "<?php functions::xecho($createContactDiv);?>", "true", "<?php echo $_SESSION['transmissionInput'];?>");
- </script>
+if (isset($_GET['created']) && $_GET['created'] <> '') {
+ ?>
+ <script type="text/javascript">
+ set_new_contact_address("<?php echo $_SESSION['config']['businessappurl'] . 'index.php?display=false&dir=my_contacts&page=get_last_contact_address'; ?>", "<?php functions::xecho($createContactDiv); ?>", "true", "<?php echo $_SESSION['transmissionInput']; ?>");
+ simpleAjax("<?php echo $_SESSION['config']['businessappurl'].'index.php?display=true&page=unsetAttachmentContact' ; ?>");
+ </script>
<?php
+
}
-?>
diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html
index f7dedc3d8c32ec5b2ea1362cf36301740dfe1c25..a2d072531d820d6d8d8ce30860b2e45f7fdc81f7 100755
--- a/apps/maarch_entreprise/template/documents_list_search_adv.html
+++ b/apps/maarch_entreprise/template/documents_list_search_adv.html
@@ -85,8 +85,7 @@ Mods
<th style="text-align:center" >
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
-
- <th style="font-size:9px;" width ="120px">##defineLang|_SUBJECT##<br/>##sortColumn|subject##</th>
+ <th style="font-size:9px;" width ="120px">##defineLang|_SUBJECT## / ##defineLang|_PRIORITY##<br/>##sortColumn|subject## / ##sortColumn|priority##</th>
<th style="font-size:9px;text-align:left;" width ="150px">##defineLang|_CATEGORY##<br/>##sortColumn|category_id##</th>
<th style="font-size:9px;" width ="140px" >##defineLang|_CREATION_DATE##<br/>##sortColumn|creation_date##</th>
<th style="font-size:9px;" width ="170px" >##defineLang|_ENTITY##<br/>##sortColumn|entity_label##</th>
@@ -197,4 +196,4 @@ Mods
$j('#container').attr('style', 'width: 90%; min-width: 1000px;');
$j('#content').attr('style', 'width: auto; min-width: 1000px;');
$j('table#extended_list').attr('style', 'width: 100%; min-width: 900px; margin: 0;');
-</script>
\ No newline at end of file
+</script>
diff --git a/modules/avis/send_docs_to_recommendation.php b/modules/avis/send_docs_to_recommendation.php
index b7c3b12a697b85a440b3f9bc948db1cf588399fb..21dfc0b8bd0e666b70cfc0f35c58c0796678427f 100755
--- a/modules/avis/send_docs_to_recommendation.php
+++ b/modules/avis/send_docs_to_recommendation.php
@@ -292,18 +292,20 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$new_difflist['difflist_type'] = 'entity_id';
- foreach ($_SESSION['redirect']['diff_list']['avis']['users'] as $key => $value) {
- //print_r($value);
- array_push(
- $new_difflist['avis']['users'],
- array(
- 'user_id' => $value['user_id'],
- 'firstname' => $value['firstname'],
- 'entity_id' => $value['entity_id'],
- 'entity_label' => $value['entity_label'],
- 'visible' => $value['visible']
- )
- );
+ if(!empty($_SESSION['redirect']['diff_list']['avis']['users'])){
+ foreach ($_SESSION['redirect']['diff_list']['avis']['users'] as $key => $value) {
+ //print_r($value);
+ array_push(
+ $new_difflist['avis']['users'],
+ array(
+ 'user_id' => $value['user_id'],
+ 'firstname' => $value['firstname'],
+ 'entity_id' => $value['entity_id'],
+ 'entity_label' => $value['entity_label'],
+ 'visible' => $value['visible']
+ )
+ );
+ }
}
if (!empty($_SESSION['redirect']['diff_list']['avis_copy']['users'])) {
diff --git a/modules/avis/validate_recommendation.php b/modules/avis/validate_recommendation.php
index 1e207637c2e8a978410ebe175692c801ae7765bc..7b14d3bc66e7baae138e7ea478f87e5b37632406 100755
--- a/modules/avis/validate_recommendation.php
+++ b/modules/avis/validate_recommendation.php
@@ -266,18 +266,20 @@ function manage_form($arr_id, $history, $id_action, $label_action, $status, $col
$new_difflist['difflist_type'] = 'entity_id';
- foreach ($_SESSION['redirect']['diff_list']['avis']['users'] as $key => $value) {
- //print_r($value);
- array_push(
- $new_difflist['avis']['users'],
- array(
- 'user_id' => $value['user_id'],
- 'firstname' => $value['firstname'],
- 'entity_id' => $value['entity_id'],
- 'entity_label' => $value['entity_label'],
- 'visible' => $value['visible']
- )
- );
+ if(!empty($_SESSION['redirect']['diff_list']['avis']['users'])){
+ foreach ($_SESSION['redirect']['diff_list']['avis']['users'] as $key => $value) {
+ //print_r($value);
+ array_push(
+ $new_difflist['avis']['users'],
+ array(
+ 'user_id' => $value['user_id'],
+ 'firstname' => $value['firstname'],
+ 'entity_id' => $value['entity_id'],
+ 'entity_label' => $value['entity_label'],
+ 'visible' => $value['visible']
+ )
+ );
+ }
}
if (!empty($_SESSION['redirect']['diff_list']['avis_copy']['users'])) {
diff --git a/sql/1804.sql b/sql/1804.sql
index f23490941260fb39774400438017e6f5fc05796c..f3eeb30952138fbd946824a2791d50ff19c20c85 100755
--- a/sql/1804.sql
+++ b/sql/1804.sql
@@ -771,6 +771,8 @@ UPDATE notifications SET event_id = 'baskets' WHERE notification_id = 'BASKETS';
DELETE FROM parameters where id = 'user_quota';
INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('user_quota', '', 0, NULL);
DELETE FROM parameters where id = 'database_version';
-INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.3', NULL, NULL);
+INSERT INTO parameters (id, param_value_string, param_value_int, param_value_date) VALUES ('database_version', '18.04.6', NULL, NULL);
INSERT INTO templates_doctype_ext SELECT null, d.type_id, 'N' FROM doctypes d LEFT JOIN templates_doctype_ext tde ON d.type_id = tde.type_id WHERE tde.type_id IS NULL;
+
+UPDATE status set img_filename = 'fm-letter' where img_filename is null or img_filename = '';