From cec189b771e25e740dd83cd27dfdbc99fadf91ff Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Thu, 15 Feb 2018 12:48:22 +0100
Subject: [PATCH] FIX #7186 remove reset contact if change category
---
apps/maarch_entreprise/actions/index_mlb.php | 4 ++--
apps/maarch_entreprise/actions/validate_mail.php | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/apps/maarch_entreprise/actions/index_mlb.php b/apps/maarch_entreprise/actions/index_mlb.php
index 493b5196267..7aea7be7877 100755
--- a/apps/maarch_entreprise/actions/index_mlb.php
+++ b/apps/maarch_entreprise/actions/index_mlb.php
@@ -551,7 +551,7 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $
. 'onclick="clear_error(\'frm_error_' . $actionId . '\');reset_check_date_exp();'
. 'change_contact_type(\'' . $_SESSION['config']['businessappurl']
. 'index.php?display=true&dir=indexing_searching&page='
- . 'autocomplete_contacts\', true);update_contact_type_session(\''
+ . 'autocomplete_contacts\', false);update_contact_type_session(\''
.$_SESSION['config']['businessappurl']
.'index.php?display=true&dir=indexing_searching&page=autocomplete_contacts_prepare_multi\');" /><label for="type_contact_internal">' . _INTERNAL2 . '</label>'
. '</td></tr>';
@@ -564,7 +564,7 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $
. 'onclick="clear_error(\'frm_error_' . $actionId . '\');'
. 'change_contact_type(\'' . $_SESSION['config']['businessappurl']
. 'index.php?display=true&dir=indexing_searching'
- . '&autocomplete_contacts\', true);update_contact_type_session(\''
+ . '&autocomplete_contacts\', false);update_contact_type_session(\''
.$_SESSION['config']['businessappurl']
.'index.php?display=true&dir=indexing_searching&page=autocomplete_contacts_prepare_multi\');" class="check"/><label for="type_contact_external">' . _EXTERNAL .'</label>'
. '</td>';
diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php
index 6fd658cc3c0..03045679fdf 100755
--- a/apps/maarch_entreprise/actions/validate_mail.php
+++ b/apps/maarch_entreprise/actions/validate_mail.php
@@ -623,26 +623,26 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module
$frm_str .= '<tr id="contact_choose_tr" style="display:'.$display_value.';">';
$frm_str .='<td class="indexing_label"><label for="type_contact" class="form_title" ><span id="exp_contact_choose_label">'._SHIPPER_TYPE.'</span><span id="dest_contact_choose_label">'._DEST_TYPE.'</span></label></td>';
$frm_str .='<td> </td>';
- $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\');update_contact_type_session(\''
+ $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.';">';
$frm_str .='<td> </td>';
$frm_str .='<td> </td>';
- $frm_str .='<td class="indexing_field">';
- $frm_str .= '<input type="radio" name="type_contact" class="check" id="type_contact_external" value="external" onclick="clear_error(\'frm_error_'.$id_action.'\');change_contact_type(\''.$_SESSION['config']['businessappurl'].'index.php?display=true&dir=indexing_searching&page=autocomplete_contacts\');update_contact_type_session(\''
+ $frm_str .='<td class="indexing_field">';
+ $frm_str .= '<input type="radio" name="type_contact" class="check" id="type_contact_external" value="external" 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\');"';
if ($data['type_contact'] == 'external') {
$frm_str .= ' checked="checked" ';
}
$frm_str .= '/><label for="type_contact_external">'._EXTERNAL.'</label></td></tr>';
-
+
$frm_str .= '<tr id="contact_choose_3_tr" style="display:' . $displayValue
. ';">';
$frm_str .= '<td> </td>';
--
GitLab