diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fb07acbd337..716e02ae678 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -317,7 +317,7 @@ if (empty($reshook) && $action == 'add')
if (GETPOST("doneby") > 0) $object->userdoneid = GETPOST("doneby", "int");
}
- $object->note = trim(GETPOST("note"));
+ $object->note_private = trim(GETPOST("note"));
if (isset($_POST["contactid"])) $object->contact = $contact;
@@ -465,7 +465,6 @@ if (empty($reshook) && $action == 'update')
$object->contactid = key($object->socpeopleassigned);
}
$object->fk_project = GETPOST("projectid", 'int');
- $object->note = GETPOST("note", "none"); // deprecated
$object->note_private = GETPOST("note", "none");
$object->fk_element = GETPOST("fk_element", "int");
$object->elementtype = GETPOST("elementtype", "alphanohtml");
@@ -1122,7 +1121,7 @@ if ($action == 'create')
// Description
print '
| '.$langs->trans("Description").' | ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor = new DolEditor('note', (GETPOST('note', 'none') ?GETPOST('note', 'none') : $object->note), '', 180, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+ $doleditor = new DolEditor('note', (GETPOST('note', 'none') ?GETPOST('note', 'none') : $object->note_private), '', 180, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
$doleditor->Create();
print ' |
';
@@ -1188,7 +1187,7 @@ if ($id > 0)
$object->contactid = GETPOST("contactid", 'int');
$object->fk_project = GETPOST("projectid", 'int');
- $object->note = GETPOST("note", 'none');
+ $object_private = GETPOST("note", 'none');
}
if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
@@ -1540,7 +1539,7 @@ if ($id > 0)
print '| '.$langs->trans("Description").' | ';
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor = new DolEditor('note', $object->note, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
+ $doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
$doleditor->Create();
print ' |
';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 09c114375b1..d5b2d542b05 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -733,14 +733,14 @@ class ActionComm extends CommonObject
$this->type_short = (($transcode != "Action".$obj->type_code.'Short') ? $transcode : '');
$this->code = $obj->code;
- $this->label = $obj->label;
- $this->datep = $this->db->jdate($obj->datep);
- $this->datef = $this->db->jdate($obj->datep2);
+ $this->label = $obj->label;
+ $this->datep = $this->db->jdate($obj->datep);
+ $this->datef = $this->db->jdate($obj->datep2);
- $this->datec = $this->db->jdate($obj->datec);
- $this->datem = $this->db->jdate($obj->datem);
+ $this->datec = $this->db->jdate($obj->datec);
+ $this->datem = $this->db->jdate($obj->datem);
- $this->note = $obj->note;
+ $this->note = $obj->note; // deprecated
$this->note_private = $obj->note;
$this->percentage = $obj->percentage;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 9f28d278ed1..a4b1a9618fb 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -553,8 +553,7 @@ if ($resql)
$actionstatic->type_picto = $obj->type_picto;
$actionstatic->label = $obj->label;
$actionstatic->location = $obj->location;
- $actionstatic->note = dol_htmlentitiesbr($obj->note); // deprecated
- $actionstatic->note_public = dol_htmlentitiesbr($obj->note);
+ $actionstatic->note_private = dol_htmlentitiesbr($obj->note);
$actionstatic->fetchResources();
@@ -613,8 +612,8 @@ if ($resql)
// Description
if (!empty($arrayfields['a.note']['checked'])) {
print '';
- $text = dolGetFirstLineOfText(dol_string_nohtmltag($actionstatic->note, 0));
- print $form->textwithtooltip(dol_trunc($text, 40), $actionstatic->note);
+ $text = dolGetFirstLineOfText(dol_string_nohtmltag($actionstatic->note_private, 0));
+ print $form->textwithtooltip(dol_trunc($text, 40), $actionstatic->note_private);
print ' | ';
}