[IMP] code improve and merge with latest.

bzr revid: tta@openerp.com-20120716114651-19wmcwhj7f6b4qj9

55 files changed, 165 insertions, 177 deletions

diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 49da04245c7..553411c59ba 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 51753d255b6..73195b1be7e 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index bf6f4db558a..6abc6e9060e 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 8a20f0d3fcd..f87a3069a0d 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index db09f811f46..a36ab73647a 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 455c84bff0e..2e11b3b1cec 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 1f9f51077b2..15953e78795 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 2479fda7f84..ff264f78b9f 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index e61530f7e28..ac9ad2a4b93 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index f99c47bbd68..1877a78c6f1 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index 2109b8a0b7d..32f285c4ca2 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "Language: \n"
 
 #. module: project
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index f57f2977b16..25b7b19009f 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index bd88b227967..102db346a59 100644
--- a/addons/project/i18n/es_PY.po
+++ b/addons/project/i18n/es_PY.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: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index 565a837e4e6..98dfbe97ec2 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 853d059b201..907699b796b 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.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: 2012-06-28 04:35+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index e1d6db8aa7c..50bf440faf0 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 1b8e319fa1a..41530cd7482 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index 1fd6599bd96..dbf9dbc5ac9 100644
--- a/addons/project/i18n/gl.po
+++ b/addons/project/i18n/gl.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index 2df235ce585..30d58780749 100644
--- a/addons/project/i18n/gu.po
+++ b/addons/project/i18n/gu.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index ea508ead52c..6f63db3b80c 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-08-03 09:16+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2012-07-06 12:24+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 "Language: hr\n"
 
 #. module: project
@@ -108,7 +108,7 @@ msgstr "Sati za procjenu"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projekti na čekanju"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -191,7 +191,7 @@ msgstr "Tvrtka"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -206,7 +206,7 @@ msgstr ""
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "Postavite u tijeku"
+msgstr "Staviti na čekanje"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -281,7 +281,7 @@ msgstr "Zadatak"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: project
 #: view:board.board:0
@@ -641,7 +641,7 @@ msgstr "Srednji"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Zadaci na čekanju"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -705,7 +705,7 @@ msgstr ""
 #: selection:project.vs.hours,state:0 view:report.project.task.user:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Pending"
-msgstr "U toku"
+msgstr "Na čekanju"
 
 #. module: project
 #: field:project.task.delegate,name:0
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 693cc2f89ae..0bd33f72335 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index e561d33b548..e4ea17975e1 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 547b485bc7f..0b676664df5 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 3fda3a1349c..33fc0203189 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2012-07-10 00:39+0000\n"
+"Last-Translator: Tomomi Mengelberg <tomomi.mengelberg@aquasys.co.jp>\n"
 "Language-Team: Japanese <ja@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-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1825,7 +1825,7 @@ msgstr "タスク %s は閉じられました。"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index ca47b5b5e52..e688e7a2b45 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index a46b3c273c8..37e1a4a1573 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index e1d51f24862..c0d84d4bdf0 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 0ea447b09a6..6b55e26570b 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index ccb1d91c49d..f51d97aae5f 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 2b0700612cb..a39c91b83d1 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index f9ff0c939de..d1a43549d8c 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index e521d434bcd..8180e49c9cb 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 40ade73da66..cdc101c1bcc 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 0ef329a5891..66e9dd62a82 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.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: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index c27db5b508f..1a2ea30ace4 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index e67cfb00200..adc9384db7f 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index ac59dd0875b..fd4d0215573 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.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: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index e25f1b73ca6..97aa104eb5f 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 6f5933bd00a..5538e44ac8c 100644
--- a/addons/project/i18n/sq.po
+++ b/addons/project/i18n/sq.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: 2012-06-28 04:35+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:34+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index dc540ba196c..814709ddfb9 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 3da06fa3dc8..04563a9d1f0 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index c93a666c720..2750fe87e06 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 67d7ec1e338..9c621e66832 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index f76abbfc84d..6199ac02ae5 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.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: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index bcbbd62c34e..c574220d586 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:36+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index cd3ec585938..07aa91419b5 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
-"X-Generator: Launchpad (build 15505)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:35+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 487daa834bb..aa9316aec1b 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -215,7 +215,7 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
                         type='many2many', relation='res.users', string='Followers'),
@@ -236,6 +236,7 @@ class project(osv.osv):
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
+        'privacy_visibility': 'public',
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -713,14 +714,14 @@ class task(base_stage, osv.osv):
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
-        'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+        'planned_hours': fields.float('Initially Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
         'effective_hours': fields.function(_hours_get, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
-        'total_hours': fields.function(_hours_get, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
+        'total_hours': fields.function(_hours_get, string='Total', multi='hours', help="Computed as: Time Spent + Remaining Time.",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
@@ -1221,7 +1222,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Management',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f18cfe4b682..9e4f3c44a27 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -82,17 +82,12 @@
                     <h1>
                         <field name="name" string="Project Name"/>
                     </h1>
-                    <label for="parent_id" class="oe_edit_only" string="Parent Project"/>
-                    <h2>
-                        <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                    </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
-                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
                         <group>
                             <table>
@@ -139,6 +134,7 @@
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                                     <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                 </group>
                             </group>
                         </page>
@@ -147,9 +143,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -239,7 +235,7 @@
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_auto_height oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                    <span class="oe_e">i</span>
+                                    <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <li><a type="edit">Edit...</a></li>
                                         <li><a type="delete">Delete</a></li>
@@ -404,11 +400,9 @@
                                     states="cancel,done"/>
                             -->
                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
-                             <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="cancelled" context="{'button_reactivate':True}"/>
+                                    states="cancelled,done" context="{'button_reactivate':True}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending"/>
+                                    states="draft,open,pending" class="oe_highlight"/>
                             <button name="do_pending" string="Pending" type="object"
                                     states="open"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
@@ -417,7 +411,7 @@
                                     states="draft,open,pending"/>
                             <button name="stage_previous" string="Previous Stage" type="object"
                                     states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                            <button name="stage_next" string="Next Stage" type="object"
+                            <button name="stage_next" string="Next Stage" type="object" class="oe_highlight"
                                     states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
                         </span>
                         <field name="stage_id" widget="statusbar"/>
@@ -427,23 +421,16 @@
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <label for="project_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="project_id"  on_change="onchange_project(project_id)"/>
-                    </h2>
                     <group>
                         <group>
+                            <field name="project_id"  on_change="onchange_project(project_id)"/>
                             <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
                             <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
-                                groups="project.group_time_work_estimation_tasks"
-                                on_change="onchange_planned(planned_hours, effective_hours)"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks"
-                                invisible="1"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
@@ -457,14 +444,15 @@
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
                                 </tree>
                             </field>
-                            <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
+                            <group>
+                             <group class="oe_subtotal_footer oe_right" name="project_hours" groups="project.group_time_work_estimation_tasks">
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" target="new" states="open,pending" icon="gtk-edit"/>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
+                             </group>
                             </group>
                             <div class="oe_clear"/>
                         </page>
@@ -490,14 +478,17 @@
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
+                                <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
+                                    groups="project.group_time_work_estimation_tasks"
+                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 22d43237538..3f7f3b26d96 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -83,7 +83,7 @@
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="project_report_task" />
+            parent="base.menu_project_report" />
 
 
         <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 30d8717efb6..36e025ab509 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -54,7 +54,6 @@ class report_project_task_user(osv.osv):
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'type_id': fields.many2one('project.task.type', 'Stage', readonly=True),
     }
     _order = 'name desc, project_id'
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a5711239f87..40235ad03b7 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,8 +5,6 @@
         <menuitem id="base.menu_project_report" name="Project"
             groups="project.group_project_manager"
             parent="base.menu_reporting" sequence="25"/>
-        <menuitem id="project_report_task" name="Tasks Analysis"
-            parent="base.menu_project_report"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
             <field name="name">report.project.task.user.tree</field>
@@ -23,7 +21,6 @@
                     <field name="date_end" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="type_id" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="year" invisible="1"/>
@@ -101,7 +98,6 @@
                     <newline/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
-                        <field name="type_id" widget="selection"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
@@ -115,7 +111,6 @@
                         <separator orientation="vertical"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
@@ -135,7 +130,7 @@
             <field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
         </record>
 
-        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="project_report_task"/>
+        <menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
 
     </data>
 </openerp>
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index ff1511d49f2..b6497e56d62 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -12,28 +12,26 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Project">
-                            <group>
-                                <field name="module_project_mrp"/>
-                                <field name="module_project_timesheet"/>
-                                <field name="module_pad"/>
-                            </group>
-                            <group>
-                                <field name="group_tasks_work_on_tasks"/>
-                                <field name="group_time_work_estimation_tasks"/>
-                                <field name="group_manage_delegation_task"/>
-                                <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
-                            </group>
+                    <group string="Project">
+                        <group>
+                            <field name="module_project_mrp"/>
+                            <field name="module_project_timesheet"/>
+                            <field name="module_pad"/>
                         </group>
-                        <group string="Planning">
-                            <field name="module_project_long_term"/>
+                        <group>
+                            <field name="group_tasks_work_on_tasks"/>
+                            <field name="group_time_work_estimation_tasks"/>
+                            <field name="group_manage_delegation_task"/>
+                            <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
                         </group>
-                        <group string="Helpdesk and Support" name="support">
-                            <field name="module_project_issue"/>
-                            <field name="module_project_issue_sheet"/>
-                        </group>
-                    </sheet>
+                    </group>
+                    <group string="Planning">
+                        <field name="module_project_long_term"/>
+                    </group>
+                    <group string="Helpdesk and Support" name="support">
+                        <field name="module_project_issue"/>
+                        <field name="module_project_issue_sheet"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 8cea913984d..b6fd90c948f 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1

-access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1

+access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0

+access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1

+access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0

+access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1

 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1

 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1

 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1

@@ -8,7 +10,9 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0

 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0

 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0

-access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0

+access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1

+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,1

+access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1

 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0

 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1

 access_project_task_history,project.task.history project,project.model_project_task_history,project.group_project_user,1,1,1,0

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7dd1cdb9465..4bd7e4b5b1d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -8,11 +8,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
-                    <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
-                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <group>
                             <field name="project_id" on_change="onchange_project_id(project_id)"/>
@@ -30,6 +25,11 @@
                             <field name="state"/>
                         </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 066f15582b4..84436c045a6 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
-                    <header>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <separator string="Reevaluation Task"/>
                     <group>
                         <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>