diff --git a/include/class/action_document_type_mtable.class.php b/include/class/action_document_type_mtable.class.php index d3cc70b14..03a7d2dbf 100644 --- a/include/class/action_document_type_mtable.class.php +++ b/include/class/action_document_type_mtable.class.php @@ -224,9 +224,7 @@ class Action_Document_Type_MTable extends Manage_Table_SQL $cn->exec_sql("insert into jnt_document_option_contact (jdoc_enable,document_type_id,contact_option_ref_id) values ($1,$2,$3)",[$this->other["contact_option".$e],$object_sql->dt_id,$option_id]); - tracedebug("insert-into-contact.log", $cn->sql); - tracedebug("insert-into-contact.log", $cn->array); - } + } } } diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index 11b5f3ca6..b04bc903e 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -616,7 +616,7 @@ class Follow_Up $table->add('Date Doc.', $url, 'order by ag_timestamp asc', 'order by ag_timestamp desc', 'da', 'dd'); $table->add('Date Comm.', $url, 'order by last_comment', 'order by last_comment desc', 'dca', 'dcd'); $table->add('Date Limite', $url, 'order by ag_remind_date asc', 'order by ag_remind_date desc', 'ra', 'rd'); - $table->add('Tag', $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad'); + $table->add('Etiquette', $url, 'order by tags asc', 'order by tags desc', 'taa', 'tad'); $table->add('Réf.', $url, 'order by ag_ref asc', 'order by ag_ref desc', 'ra', 'rd'); $table->add('Groupe', $url, "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe')", "order by coalesce((select p_name from profile where p_id=ag_dest),'Aucun groupe') desc", 'dea', 'ded'); $table->add('Dest/Exp', $url, 'order by name asc', 'order by name desc', 'ea', 'ed'); @@ -666,7 +666,7 @@ class Follow_Up $r.=''.$table->get_header(0).''; $r.=''.$table->get_header(1).''; $r.=''.$table->get_header(2).''; - $r.=''.$table->get_header(3).''; + $r.=''.$table->get_header(3).''; $r.=''.$table->get_header(4).''; $r.=''.$table->get_header(5).''; $r.=''.$table->get_header(6).''; diff --git a/include/template/action_document_type_mtable_input.php b/include/template/action_document_type_mtable_input.php index 9328c4c80..784a4f069 100644 --- a/include/template/action_document_type_mtable_input.php +++ b/include/template/action_document_type_mtable_input.php @@ -25,6 +25,7 @@ if (!defined('ALLOWED')) * @file * @brief called from p_id already set, * @see action_document_type_mtable::input + * @see */ // SQL Object Document_Type $table=$this->get_table(); @@ -107,7 +108,12 @@ for ($i=0;$i<$nb_option;$i++) echo '
  • '; echo HtmlInput::hidden("cor_id[]", $aOption[$i]["cor_id"]); - $is=new InputSwitch("contact_option$i",$aOption[$i]["jdoc_enable"]); + $is=new ICheckBox("contact_option$i",1); + if ($aOption[$i]['jdoc_enable'] ==1 ) { + $is->set_check(1); + } else { + $is->set_check(0); + } echo $is->input(); echo "   "._($aOption[$i]['cor_label']); echo '
  • ';