Merge with trunk

bzr revid: rgaopenerp-20121109052743-v8ts1k78k37dfgpx

4 files changed, 346 insertions, 7 deletions

diff --git a/addons/note/i18n/nl.po b/addons/note/i18n/nl.po
new file mode 100644
index 00000000000..0e3baeee351
--- /dev/null
+++ b/addons/note/i18n/nl.po
@@ -0,0 +1,339 @@
+# Dutch 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-07 14:51+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@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-08 04:47+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Notitie inhoud"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Notitie fases"
+
+#. 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 "Notitie label"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Notitie / Luxe modus"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Notitie"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. 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"
+"            Klik om een persoonlijke notitie toe te voegen.\n"
+"          </p><p>\n"
+"            Gebruik notities om uw persoonlijke taken en notities te "
+"organiseren. Alle\n"
+"            notities zijn prive; niemand anders kan deze notities zien. "
+"Echter is het wel \n"
+"            mogenlijk om sommige notities te delen met andere gebruikers, "
+"door deze uit te nodigen\n"
+"            op een notitie. (Dit is handig voor bijvoorbeeld een "
+"gespreksverslag, en zeker als je\n"
+"            de pad mogelijkheid activeert voor het samenwerken)\n"
+"          </p><p>\n"
+"            U kunt het proces van notities en taken aanpassen door het "
+"toevoegen,\n"
+"            verwijderen of aanpassen van kolommen.\n"
+"          </p>\n"
+"        "
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr "kanban notitie"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Vandaag"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Notitie fases"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr "Notitie categorie"
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Naam fase"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr "titel"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Eigenaar van de berichten fase"
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorieën"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Opmerkingen en e-mails."
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Label naam"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. 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 "Notities"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Later"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Notitie fase"
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr "keuze menu"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr "Ochtend"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Wordt gebruikt om de notitie fases te sorteren"
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr "W"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Gebrukers fases"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Notitie samenvatting"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Fases"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatie historie"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Verwijderen"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Kleur index"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Reeks"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Labels"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Archief"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Gebruik collaboratieve pads (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 ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "Gebruik luxe layouts voor notities"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Eigenaar"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Het gekozen bedrijf is niet toegestaan voor deze gebruiker"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Datum verwerkt"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Standaard ingevouwen"
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 5c3a77b7626..18a3ec840a9 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -59,18 +59,18 @@
 
               <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
                 <div class="oe_dropdown_kanban">
-                  <span>
-                    <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value" class="oe_e">W</a>
-                    <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value" class="oe_e">W</a>
-                  </span>
 
                   <!-- dropdown menu -->
-                  <div class="oe_dropdown_toggle">
+                  <span class="oe_dropdown_toggle">
                     <span class="oe_e">í</span>
                     <ul class="oe_dropdown_menu">
                       <li><a type="delete">Delete</a></li>
                       <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                     </ul>
+                  </span>
+                  <div style="display: inline">
+                    <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value" class="oe_e">W</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value" class="oe_e">W</a>
                   </div>
                 </div>
                 <!-- kanban note -->
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 43bc455e04a..1b7e9315e74 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -46,7 +46,7 @@
 .openerp .oe_kanban_record .oe_kanban_card_fancy {
   text-shadow: none;
   border-radius: 2px;
-  padding: 12px;
+  padding: 8px;
   margin-left: 3px;
   margin-right: 3px;
   padding-bottom: 16px;
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index ff39ce8708c..b5bc28a2593 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -50,7 +50,7 @@
     .oe_kanban_card_fancy
       text-shadow: none
       border-radius: 2px
-      padding: 12px
+      padding: 8px
       margin-left: 3px
       margin-right: 3px
       padding-bottom: 16px