diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index 1637c3953..26a8927eb 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -1117,7 +1117,7 @@ class Follow_Up /* State of documents */ $type_state=new ISelect('state'); $aState=$cn->make_array('select s_id,s_value from document_state order by s_value'); - $aState[]=array('value'=>'-1', 'label'=>_('Tous les Etats')); + $aState[]=array('value'=>'-1', 'label'=>_('Tous les actions ouvertes')); $type_state->value=$aState; $type_state->selected=(isset($_GET['state']))?$_GET['state']:-1; @@ -1235,7 +1235,7 @@ class Follow_Up if ($p_array==null) $p_array=$_GET; $action_query=""; - + $ag_state=""; //= ag_remind_date"; } - if (!isset($p_array['closed_action'])) + // only for open action or a closing status is selected + if (!isset($p_array['closed_action']) && $ag_state == "") { $action_query.=" and s_status is null "; } diff --git a/include/template/action_search.php b/include/template/action_search.php index 657f5d940..58cab5517 100644 --- a/include/template/action_search.php +++ b/include/template/action_search.php @@ -56,6 +56,10 @@ input()?> + + + input();?> + input()?> @@ -103,10 +107,7 @@ input();?> - - - input();?> - +