diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index b34c5d0e0b7..a0e91a120f9 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -127,7 +127,7 @@ $arrayfields=array(
'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
'a.fk_contact'=>array('label'=>"Contact", 'checked'=>1),
- 'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
+ 'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>0, 'enabled'=>(! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
);
@@ -427,7 +427,7 @@ if ($resql)
if (! empty($arrayfields['a.id']['checked'])) print '
| ';
if (! empty($arrayfields['owner']['checked'])) print ' | ';
if (! empty($arrayfields['c.libelle']['checked'])) print ' | ';
- if (! empty($arrayfields['a.label']['checked'])) print ' | ';
+ if (! empty($arrayfields['a.label']['checked'])) print ' | ';
if (! empty($arrayfields['a.datep']['checked'])) {
print '';
print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1);
@@ -454,6 +454,7 @@ if ($resql)
if (! empty($arrayfields['a.percent']['checked'])) {
print ' | ';
print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+ print ajax_combobox('selectstatus');
print ' | ';
}
// Action column
@@ -560,14 +561,14 @@ if ($resql)
// Label
if (! empty($arrayfields['a.label']['checked'])) {
- print '';
+ print ' | ';
print $actionstatic->label;
print ' | ';
}
// Start date
if (! empty($arrayfields['a.datep']['checked'])) {
- print '';
+ print ' | ';
print dol_print_date($db->jdate($obj->dp),"dayhour");
$late=0;
if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
@@ -580,7 +581,7 @@ if ($resql)
// End date
if (! empty($arrayfields['a.datep2']['checked'])) {
- print ' | ';
+ print ' | ';
print dol_print_date($db->jdate($obj->dp2),"dayhour");
print ' | ';
}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 730dce5e56a..9f8d1988c07 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -135,7 +135,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
print '';
}
- if ($canedit && ! preg_match('/listaction/', $_SERVER["PHP_SELF"]))
+ if ($canedit && ! preg_match('/list/', $_SERVER["PHP_SELF"]))
{
// Status
print '';