[MERGE] forward port of branch 8.0 up to ed1c173

3 files changed, 207 insertions, 115 deletions

diff --git a/addons/note/README.md b/addons/note/README.md
new file mode 100644
index 00000000000..9eeea063546
--- /dev/null
+++ b/addons/note/README.md
@@ -0,0 +1,58 @@
+Odoo Notes
+----------
+
+Organize yourself with efficient <a href="https://www.odoo.com/page/notes">todo lists and notes</a>.
+From personal tasks to collaborative meeting minutes, increase your user's
+productivity by giving them the tools to prioritize their work, share their
+ideas and collaborate on documents.
+
+Personal to-do lists that works
+-------------------------------
+
+Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.
+
+### Beat Work Overload
+
+Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to [Get Things Done](http://en.wikipedia.org/wiki/Getting_Things_Done).
+
+### Prioritize Efficiently
+
+Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks.
+
+### Find Motivation to Close Tasks
+
+People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done.
+
+Adapts to Your Creative Process
+-------------------------------
+
+### Customize to your own workflow
+
+Everyone has their own way to organize activities. Odoo Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes.
+
+### A Creative Person
+
+A creative person will organize notes based on idea's maturity level: Draft Ideas ** Mature Ideas ** Specified **To Do
+
+### A Frequent Traveler
+
+An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home
+
+### A Manager
+
+A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later
+
+Personnal Notes
+---------------
+
+### Notes are private but can be shared
+
+Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad.
+
+Collaborative Meeting Minutes
+-----------------------------
+
+### Real-time sharing and edition of notes
+
+The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.
+
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 467ace4eae0..7afe1511066 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -36,7 +36,7 @@ meeting minutes.
 Notes can be found in the 'Home' menu.
 """,
     'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
+    'website': 'https://www.odoo.com/page/notes',
     'summary': 'Sticky notes, Collaborative, Memos',
     'sequence': 9,
     'depends': [
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 632af8c42ef..223fcbba7f7 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* note
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Project-Id-Version: Odoo Server 8.0rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 17:04+0000\n"
+"POT-Creation-Date: 2014-08-14 13:08+0000\n"
+"PO-Revision-Date: 2014-08-14 13:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,261 +16,295 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: note
-#: field:note.note,memo:0
-msgid "Note Content"
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. However\n"
+"            you can share some notes with other people by inviting followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
 msgstr ""
 
 #. module: note
-#: view:note.stage:0
-msgid "Stages of Notes"
+#: view:note.note:note.view_note_note_filter
+#: field:note.note,open:0
+msgid "Active"
 msgstr ""
 
 #. module: note
-#: model:note.stage,name:note.demo_note_stage_04
-#: model:note.stage,name:note.note_stage_02
-msgid "This Week"
+#: view:note.note:note.view_note_note_filter
+msgid "Archive"
 msgstr ""
 
 #. module: note
-#: model:ir.model,name:note.model_base_config_settings
-msgid "base.config.settings"
+#: view:note.note:note.view_note_note_filter
+msgid "By sticky note Category"
 msgstr ""
 
 #. module: note
-#: model:ir.model,name:note.model_note_tag
-msgid "Note Tag"
+#: field:note.note,color:0
+msgid "Color Index"
 msgstr ""
 
 #. module: note
-#: model:res.groups,name:note.group_note_fancy
-msgid "Notes / Fancy mode"
+#: field:note.note,create_uid:0
+#: field:note.stage,create_uid:0
+#: field:note.tag,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: note
-#: model:ir.model,name:note.model_note_note
-#: view:note.note:0
-msgid "Note"
+#: field:note.note,create_date:0
+#: field:note.stage,create_date:0
+#: field:note.tag,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "Group By..."
+#: field:note.note,date_done:0
+msgid "Date done"
 msgstr ""
 
 #. module: note
-#: field:note.note,message_follower_ids:0
-msgid "Followers"
+#: help:note.note,message_last_post:0
+msgid "Date of the last message posted on the record."
 msgstr ""
 
 #. module: note
-#: model:ir.actions.act_window,help:note.action_note_note
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"            Click to add a personal note.\n"
-"          </p><p>\n"
-"            Use notes to organize personal tasks or notes. All\n"
-"            notes are private; no one else will be able to see them. However\n"
-"            you can share some notes with other people by inviting followers\n"
-"            on the note. (Useful for meeting minutes, especially if\n"
-"            you activate the pad feature for collaborative writings).\n"
-"          </p><p>\n"
-"            You can customize how you process your notes/tasks by adding,\n"
-"            removing or modifying columns.\n"
-"          </p>\n"
-"        "
+#: view:note.note:note.view_note_note_kanban
+msgid "Delete"
 msgstr ""
 
 #. module: note
-#: model:note.stage,name:note.demo_note_stage_01
-#: model:note.stage,name:note.note_stage_01
-msgid "Today"
+#: field:note.stage,fold:0
+msgid "Folded by Default"
 msgstr ""
 
 #. module: note
-#: model:ir.model,name:note.model_res_users
-msgid "Users"
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "í"
+#: view:note.note:note.view_note_note_filter
+msgid "Group By"
 msgstr ""
 
 #. module: note
-#: view:note.stage:0
-msgid "Stage of Notes"
+#: help:note.note,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: note
-#: field:note.note,message_unread:0
-msgid "Unread Messages"
+#: field:note.note,id:0
+#: field:note.stage,id:0
+#: field:note.tag,id:0
+msgid "ID"
 msgstr ""
 
 #. module: note
-#: field:note.note,current_partner_id:0
-msgid "unknown"
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "By sticky note Category"
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
 msgstr ""
 
 #. module: note
-#: help:note.note,message_unread:0
-msgid "If checked new messages require your attention."
+#: field:note.note,message_last_post:0
+msgid "Last Message Date"
 msgstr ""
 
 #. module: note
-#: field:note.stage,name:0
-msgid "Stage Name"
+#: field:note.note,write_uid:0
+#: field:note.stage,write_uid:0
+#: field:note.tag,write_uid:0
+msgid "Last Updated by"
 msgstr ""
 
 #. module: note
-#: field:note.note,message_is_follower:0
-msgid "Is a Follower"
+#: field:note.note,write_date:0
+#: field:note.stage,write_date:0
+#: field:note.tag,write_date:0
+msgid "Last Updated on"
 msgstr ""
 
 #. module: note
-#: model:note.stage,name:note.demo_note_stage_02
-msgid "Tomorrow"
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,open:0
-msgid "Active"
+#: field:note.note,message_ids:0
+msgid "Messages"
 msgstr ""
 
 #. module: note
-#: help:note.stage,user_id:0
-msgid "Owner of the note stage."
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
 msgstr ""
 
 #. module: note
-#: model:ir.ui.menu,name:note.menu_notes_stage
-msgid "Categories"
+#: model:note.stage,name:note.note_stage_00
+msgid "New"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:note.view_note_note_filter
+#: view:note.note:note.view_note_note_form
+msgid "Note"
 msgstr ""
 
 #. module: note
-#: field:note.tag,name:0
-msgid "Tag Name"
+#: field:note.note,memo:0
+msgid "Note Content"
 msgstr ""
 
 #. module: note
-#: field:note.note,message_ids:0
-msgid "Messages"
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
 msgstr ""
 
 #. module: note
-#: view:base.config.settings:0
+#: view:base.config.settings:note.view_general_settings_note_form
 #: model:ir.actions.act_window,name:note.action_note_note
 #: model:ir.ui.menu,name:note.menu_note_notes
-#: view:note.note:0
+#: view:note.note:note.view_note_note_filter
 #: model:note.stage,name:note.note_stage_04
 msgid "Notes"
 msgstr ""
 
 #. module: note
-#: model:note.stage,name:note.demo_note_stage_03
-#: model:note.stage,name:note.note_stage_03
-msgid "Later"
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
 msgstr ""
 
 #. module: note
-#: model:ir.model,name:note.model_note_stage
-msgid "Note Stage"
+#: field:note.note,user_id:0
+#: field:note.stage,user_id:0
+msgid "Owner"
 msgstr ""
 
 #. module: note
-#: field:note.note,message_summary:0
-msgid "Summary"
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
 msgstr ""
 
 #. module: note
-#: field:note.note,stage_ids:0
-msgid "Stages of Users"
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
 msgstr ""
 
 #. module: note
-#: field:note.note,name:0
-msgid "Note Summary"
+#: view:note.note:note.view_note_note_filter
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: view:note.stage:note.view_note_stage_form
+msgid "Stage of Notes"
 msgstr ""
 
 #. module: note
 #: model:ir.actions.act_window,name:note.action_note_stage
-#: view:note.note:0
+#: model:ir.ui.menu,name:note.menu_notes_stage
+#: view:note.note:note.view_note_note_tree
 msgid "Stages"
 msgstr ""
 
 #. module: note
-#: help:note.note,message_ids:0
-msgid "Messages and communication history"
+#: view:note.stage:note.view_note_stage_tree
+msgid "Stages of Notes"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "Delete"
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
 msgstr ""
 
 #. module: note
-#: field:note.note,color:0
-msgid "Color Index"
+#: field:note.note,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: note
-#: field:note.note,sequence:0
-#: field:note.stage,sequence:0
-msgid "Sequence"
+#: field:note.tag,name:0
+msgid "Tag Name"
 msgstr ""
 
 #. module: note
+#: view:note.note:note.view_note_note_form
 #: field:note.note,tag_ids:0
 msgid "Tags"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "Archive"
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
 msgstr ""
 
 #. module: note
-#: field:base.config.settings,module_note_pad:0
-msgid "Use collaborative pads (etherpad)"
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
 msgstr ""
 
 #. module: note
-#: help:note.note,message_summary:0
-msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
 msgstr ""
 
 #. module: note
-#: field:base.config.settings,group_note_fancy:0
-msgid "Use fancy layouts for notes"
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
 msgstr ""
 
 #. module: note
-#: field:note.stage,user_id:0
-msgid "Owner"
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
 msgstr ""
 
 #. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
 msgstr ""
 
 #. module: note
-#: field:note.note,date_done:0
-msgid "Date done"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
 msgstr ""
 
 #. module: note
-#: field:note.stage,fold:0
-msgid "Folded by Default"
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
 msgstr ""