[MRG] merge with main branch

bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt

24 files changed, 83 insertions, 63 deletions

diff --git a/addons/note/i18n/bs.po b/addons/note/i18n/bs.po
index 333032b6b7c..804a319a817 100644
--- a/addons/note/i18n/bs.po
+++ b/addons/note/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/cs.po b/addons/note/i18n/cs.po
index 2b96b8bd827..bbb4622485b 100644
--- a/addons/note/i18n/cs.po
+++ b/addons/note/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/de.po b/addons/note/i18n/de.po
index 5dc6b5f5b4f..9397655c671 100644
--- a/addons/note/i18n/de.po
+++ b/addons/note/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/es.po b/addons/note/i18n/es.po
index 0e073662720..43235726f2e 100644
--- a/addons/note/i18n/es.po
+++ b/addons/note/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/fi.po b/addons/note/i18n/fi.po
index 742462879cd..d4f4186ae01 100644
--- a/addons/note/i18n/fi.po
+++ b/addons/note/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/fr.po b/addons/note/i18n/fr.po
index b03e9477ac6..9e8417ecee1 100644
--- a/addons/note/i18n/fr.po
+++ b/addons/note/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/hr.po b/addons/note/i18n/hr.po
index 6bb15e82f38..7ef1a63332b 100644
--- a/addons/note/i18n/hr.po
+++ b/addons/note/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/hu.po b/addons/note/i18n/hu.po
index 456e7426c15..00b8450b8c7 100644
--- a/addons/note/i18n/hu.po
+++ b/addons/note/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/id.po b/addons/note/i18n/id.po
index 3fbc2fdf738..94defa56b1b 100644
--- a/addons/note/i18n/id.po
+++ b/addons/note/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/it.po b/addons/note/i18n/it.po
index 99f997d164e..ad33d1cf4b1 100644
--- a/addons/note/i18n/it.po
+++ b/addons/note/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/lt.po b/addons/note/i18n/lt.po
index e1276cee0e4..b93e713406a 100644
--- a/addons/note/i18n/lt.po
+++ b/addons/note/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/mk.po b/addons/note/i18n/mk.po
index be14de77486..3ed8c085a30 100644
--- a/addons/note/i18n/mk.po
+++ b/addons/note/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/mn.po b/addons/note/i18n/mn.po
index c2075b0f462..44537c2da8d 100644
--- a/addons/note/i18n/mn.po
+++ b/addons/note/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/nl.po b/addons/note/i18n/nl.po
index 7d870496984..df07d55f9dc 100644
--- a/addons/note/i18n/nl.po
+++ b/addons/note/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/pl.po b/addons/note/i18n/pl.po
index a9141ffb5c8..cb862d6703b 100644
--- a/addons/note/i18n/pl.po
+++ b/addons/note/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/pt.po b/addons/note/i18n/pt.po
index 3eb1ff2b1aa..55d293f67d1 100644
--- a/addons/note/i18n/pt.po
+++ b/addons/note/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index 3f10668da0d..7155f95c738 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/ro.po b/addons/note/i18n/ro.po
index 1d5730d8d50..54166816bff 100644
--- a/addons/note/i18n/ro.po
+++ b/addons/note/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/ru.po b/addons/note/i18n/ru.po
index a9d743b4127..48cb1d926c0 100644
--- a/addons/note/i18n/ru.po
+++ b/addons/note/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/sl.po b/addons/note/i18n/sl.po
index 080b65d28e4..88bc93205a3 100644
--- a/addons/note/i18n/sl.po
+++ b/addons/note/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/sv.po b/addons/note/i18n/sv.po
index 79674ca5568..448035d99e8 100644
--- a/addons/note/i18n/sv.po
+++ b/addons/note/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -83,6 +83,24 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"             Klicka för att lägga till en personlig anteckning.\n"
+"           </p><p>\n"
+"             Använd anteckningar för att organisera personliga uppgifter "
+"eller anteckningar. Alla\n"
+"             anteckningar är privata, ingen annan kommer att kunna se dem. "
+"emellertid\n"
+"             du kan dela några anteckningar med andra personer genom att "
+"bjuda in följare\n"
+"             på anteckningen. (Användbart för mötesanteckningar, särskilt "
+"om\n"
+"             du aktiverar pad-funktionen för samarbetsredigering).\n"
+"           </p>\n"
+"             Du kan anpassa hur du behandlar dina anteckningar / uppgifter "
+"genom att lägga till,\n"
+"             tar bort eller modifierar kolumner.\n"
+"           </ p>\n"
+"        "
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_01
@@ -123,7 +141,7 @@ msgstr ""
 #. module: note
 #: help:note.note,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: note
 #: field:note.stage,name:0
@@ -190,60 +208,60 @@ msgstr "Senare"
 #. module: note
 #: model:ir.model,name:note.model_note_stage
 msgid "Note Stage"
-msgstr ""
+msgstr "Anteckningsetapp"
 
 #. module: note
 #: field:note.note,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
-msgstr ""
+msgstr "Användares etapper"
 
 #. module: note
 #: field:note.note,name:0
 msgid "Note Summary"
-msgstr ""
+msgstr "Anteckningssammandrag"
 
 #. module: note
 #: model:ir.actions.act_window,name:note.action_note_stage
 #: view:note.note:0
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: note
 #: help:note.note,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: note
 #: view:note.note:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: note
 #: field:note.note,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Färgindex"
 
 #. module: note
 #: field:note.note,sequence:0
 #: field:note.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: note
 #: view:note.note:0
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: note
 #: view:note.note:0
 msgid "Archive"
-msgstr ""
+msgstr "Arkiv"
 
 #. module: note
 #: field:base.config.settings,module_note_pad:0
@@ -256,6 +274,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
@@ -266,7 +286,7 @@ msgstr ""
 #: field:note.note,current_partner_id:0
 #: field:note.stage,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Ägare"
 
 #. module: note
 #: help:note.stage,sequence:0
@@ -276,9 +296,9 @@ msgstr ""
 #. module: note
 #: field:note.note,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Klardatum"
 
 #. module: note
 #: field:note.stage,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "Nedvikt som standard"
diff --git a/addons/note/i18n/tr.po b/addons/note/i18n/tr.po
index b9026f51e57..bfa594b457f 100644
--- a/addons/note/i18n/tr.po
+++ b/addons/note/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/i18n/zh_CN.po b/addons/note/i18n/zh_CN.po
index 66416c51fd5..c4bd5015fa9 100644
--- a/addons/note/i18n/zh_CN.po
+++ b/addons/note/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:32+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 08:28+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
diff --git a/addons/note/note.py b/addons/note/note.py
index 7f03f43b36a..38b2395a852 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -116,7 +116,7 @@ class note_note(osv.osv):
     }
     _order = 'sequence'
 
-    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False, lazy=True):
         if groupby and groupby[0]=="stage_id":
 
             #search all stages
@@ -169,7 +169,7 @@ class note_note(osv.osv):
 
         else:
             return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby, 
-                offset=offset, limit=limit, context=context, orderby=orderby)
+                offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy)
 
 
 #upgrade config setting page to configure pad, fancy and tags mode