'."\n";
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index e229663e55f..136a3ebc7e2 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -336,6 +336,8 @@ class EcmFiles extends CommonObject
$sql .= " t.tms as date_m,";
$sql .= " t.fk_user_c,";
$sql .= " t.fk_user_m,";
+ $sql .= ' t.note_private,';
+ $sql .= ' t.note_public,';
$sql .= " t.acl,";
$sql .= " t.src_object_type,";
$sql .= " t.src_object_id";
@@ -398,6 +400,8 @@ class EcmFiles extends CommonObject
$this->date_m = $this->db->jdate($obj->date_m);
$this->fk_user_c = $obj->fk_user_c;
$this->fk_user_m = $obj->fk_user_m;
+ $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
$this->acl = $obj->acl;
$this->src_object_type = $obj->src_object_type;
$this->src_object_id = $obj->src_object_id;
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
new file mode 100644
index 00000000000..f7810dec887
--- /dev/null
+++ b/htdocs/ecm/file_note.php
@@ -0,0 +1,176 @@
+
+ * Copyright (C) 2004-2016 Laurent Destailleur
+ * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2013 Florian Henry
+ * Copyright (C) 2017 Ferran Marcet
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file htdocs/ecm/file_note.php
+ * \ingroup ecm
+ * \brief Fiche de notes sur une ecm file
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('ecm'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->rights->ecm->setup) accessforbidden();
+
+// Get parameters
+$socid = GETPOST("socid", "int");
+// Security check
+if ($user->socid > 0) {
+ $action = '';
+ $socid = $user->socid;
+}
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
+
+$section = GETPOST("section", 'alpha');
+if (!$section) {
+ dol_print_error('', 'Error, section parameter missing');
+ exit;
+}
+$urlfile = GETPOST("urlfile");
+if (!$urlfile) {
+ dol_print_error('', "ErrorParamNotDefined");
+ exit;
+}
+
+// Load ecm object
+$ecmdir = new EcmDirectory($db);
+$result = $ecmdir->fetch(GETPOST("section", 'alpha'));
+if (!$result > 0) {
+ dol_print_error($db, $ecmdir->error);
+ exit;
+}
+$relativepath = $ecmdir->getRelativePath();
+$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+
+$fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
+
+$file = new stdClass();
+$file->section_id = $ecmdir->id;
+$file->label = $urlfile;
+
+$relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
+$filepath = $relativepath.$file->label;
+$filepathtodocument = $relativetodocument.$file->label;
+
+// Try to load object from index
+$object = new ECMFiles($db);
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$result = $object->fetch(0, '', $filepathtodocument);
+if ($result < 0) {
+ dol_print_error($db, $object->error, $object->errors);
+ exit;
+}
+
+$permissionnote = $user->rights->ecm->setup; // Used by the include of actions_setnotes.inc.php
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('EcmFiles'));
+
+$form = new Form($db);
+
+$head = ecm_file_prepare_head($file);
+
+print dol_get_fiche_head($head, 'note', $langs->trans("File"), -1, 'generic');
+
+$s = '';
+$tmpecmdir = new EcmDirectory($db); // Need to create a new one
+$tmpecmdir->fetch($ecmdir->id);
+$result = 1;
+$i = 0;
+while ($tmpecmdir && $result > 0) {
+ $tmpecmdir->ref = $tmpecmdir->label;
+ $s = $tmpecmdir->getNomUrl(1).$s;
+ if ($tmpecmdir->fk_parent)
+ {
+ $s = ' -> '.$s;
+ $result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
+ } else {
+ $tmpecmdir = 0;
+ }
+ $i++;
+}
+
+$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfile);
+
+$s = img_picto('', 'object_dir').' '.$langs->trans("ECMRoot").' -> '.$s.' -> ';
+if ($action == 'edit') $s .= '';
+else $s .= $urlfiletoshow;
+
+$linkback = '';
+if ($backtopage) {
+ $linkback = ''.$langs->trans("BackToTree").'';
+}
+
+$object->ref = ''; // Force to hide ref
+dol_banner_tab($object, '', $linkback, 0, '', '', $s);
+
+
+
+print '';
+print '
';
+
+
+$cssclass = "titlefield";
+$moreparam = '§ion='.$section.'&urlfile='.$urlfile;
+include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+print '