[MERGE]merge with trunk

bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g

7 files changed, 345 insertions, 8 deletions

diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index d87ee70086d..797270637e2 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -38,6 +38,7 @@ Notes can be found in the 'Home' menu.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'summary': 'Sticky notes, Collaborative, Memos',
+    'sequence': 9,
     'depends': [
         'mail',
     ],
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
new file mode 100644
index 00000000000..eea43f2275f
--- /dev/null
+++ b/addons/note/i18n/pt_BR.po
@@ -0,0 +1,334 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"PO-Revision-Date: 2012-11-14 04:29+0000\n"
+"Last-Translator: Guilherme R. Santos <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-15 04:42+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Conteúdo da Nota"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Estágio das Notas"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Tag da Nota"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Notas / Modo fantasia"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. 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"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar nota pessoal.\n"
+"          </p><p>\n"
+"            Use notas para organizar tarefas ou notas pessoais. Todas\n"
+"            notas são privadas; ninguém mais é capaz de vê-las. Contudo\n"
+"            você pode compartilhar algumas notas com outras pessoas "
+"convidando seguidores\n"
+"            na nota. (Útil para atas de reunião, especialmente se\n"
+"            você ativar o recurso \"PAD\" para textos colaborativos).\n"
+"          </p><p>\n"
+"            Você pode customizar a forma como você processa suas "
+"notas/tarefas adicionando,\n"
+"            removendo ou modificando colunas.\n"
+"          </p>\n"
+"        "
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr "nota kanban"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Hoje"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Usuários"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Estágios das Notas"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens não lidas"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se marcado novas mensagens requerem sua atenção"
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Nome do Estágio"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um seguidor"
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr "título"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Proprietário do estágio da nota."
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Comentários e emails"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Nome da Tag"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Notas"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Mais tarde"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Estágio da Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr "dropdown menu"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr "Manhã"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Usado para ordenar os estágios das notas"
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr "W"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Estágios de Usuários"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Resumo da Nota"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Estágios"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Excluir"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Índice de Cores"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequencia"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Tags"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Arquivo"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Usar pads colaborativos (etherpad)"
+
+#. 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."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "Usar leiautes fantasia para notas"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Data de conclusão"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Dobrado por Padrão"
diff --git a/addons/note/note.py b/addons/note/note.py
index fe5eca5efd7..9e1a9187095 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -20,9 +20,7 @@
 ##############################################################################
 
 from openerp.osv import osv, fields
-from tools.translate import _
-import re
-from openerp.tools.misc import html2plaintext
+from openerp.tools import html2plaintext
 
 class note_stage(osv.osv):
     """ Category of Note """
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 18a3ec840a9..5aae6204d86 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -120,7 +120,7 @@
                 <field name="memo" widget="html" class="oe_memo" editor_height="450px" />
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers"/>
-                    <field class="oe_chatter" name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index 1195314cc9e..b0c79561355 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -6,6 +6,10 @@
     <field model="ir.model" ref="model_note_note" name="model_id"/>
     <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
+    <field eval="1" name="perm_unlink"/>
+    <field eval="0" name="perm_write"/>
+    <field eval="1" name="perm_read"/>
+    <field eval="0" name="perm_create"/>
   </record>
 
   <record id="note_stage_rule_global" model="ir.rule">
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 1b7e9315e74..16d71e28aa5 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -49,8 +49,8 @@
   padding: 8px;
   margin-left: 3px;
   margin-right: 3px;
-  padding-bottom: 16px;
-  margin-bottom: 16px;
+  padding-bottom: 8px;
+  margin-bottom: 10px;
   -webkit-transform: rotate(-2deg);
   -o-transform: rotate(-2deg);
   -moz-transform: rotate(-2deg);
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index b5bc28a2593..6f0c0883ae7 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -53,8 +53,8 @@
       padding: 8px
       margin-left: 3px
       margin-right: 3px
-      padding-bottom: 16px
-      margin-bottom: 16px
+      padding-bottom: 8px
+      margin-bottom: 10px
       @include rotate(-2deg)
       @include transition(all, 300ms)
   .oe_kanban_record:nth-of-type(even)