[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110831092527-b86v0k9l0cvpbu0b

11 files changed, 306 insertions, 350 deletions

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 97305b94c6b..a2387ce24dc 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -60,7 +60,6 @@ Dashboard for project members that includes:
     ],
     'demo_xml': [
         'project_demo.xml',
-        'board_project_demo.xml',
     ],
     'test':[
         'test/test_project.yml',
diff --git a/addons/project/board_project_demo.xml b/addons/project/board_project_demo.xml
deleted file mode 100644
index 85bf3140d26..00000000000
--- a/addons/project/board_project_demo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <!--
-         Administrator shortcut
-         Demo user startup menu
-         -->
-
-        <record id="note_project" model="board.note">
-            <field name="name">Don't forget the new development policies.</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="type">Project</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index c34b367a900..b9ff6331db0 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data>
 
-        <record id="note_project_type" model="board.note.type">
-            <field name="name">Project managers</field>
-        </record>
-
         <!--
          Board for project managers
          -->
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 822781ccb38..6470dd3e49d 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data>
 
-        <record id="note_project_manager_type" model="board.note.type">
-            <field name="name">Project</field>
-        </record>
-
         <!-- My task -->
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
@@ -79,13 +75,6 @@
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
-        <record id="action_view_board_note_tree" model="ir.actions.act_window">
-            <field name="name">Public Notes</field>
-            <field name="res_model">board.note</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('type','=','Project')]</field>
-        </record>
         <record id="board_project_form" model="ir.ui.view">
             <field name="name">board.project.form</field>
             <field name="model">board.board</field>
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 6afadc70bd2..36053262038 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-10-30 08:48+0000\n"
-"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
-"tic.com>\n"
+"PO-Revision-Date: 2011-08-17 22:31+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 04:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-08-23 05:04+0000\n"
+"X-Generator: Launchpad (build 13697)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -25,13 +24,13 @@ msgstr "Tasques assignades"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Torna a incloure la descripció de la tasca en la tasca de l'usuari."
 
 #. module: project
-#: code:addons/project/project.py:658
+#: code:addons/project/project.py:671
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "La tasca '%s' ha estat delegada a %s."
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -49,19 +48,21 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"La companyia seleccionada no està en les companyies permeses per aquest "
+"usuari"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Poseu aquí les hores que queden per tancar la tasca."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Terminis"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr "Operació no permesa!"
@@ -70,7 +71,7 @@ msgstr "Operació no permesa!"
 #: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CHECK: %s"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:55
@@ -85,7 +86,7 @@ msgstr "COMPROVA: "
 #. module: project
 #: field:project.installer,project_issue:0
 msgid "Issues Tracker"
-msgstr ""
+msgstr "Seguiment d'incidències"
 
 #. module: project
 #: field:project.installer,hr_timesheet_sheet:0
@@ -121,17 +122,19 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Indica l'ordre de seqüència quan es mostra una llista de projectes."
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"Error! La data d'inici del projecte ha de ser anterior a la data final del "
+"projecte."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Re-avaluació de la tasca"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,7 +149,7 @@ msgstr "Tasca per delegació"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Març"
 
 #. module: project
 #: view:project.task:0
@@ -175,7 +178,7 @@ msgstr "Les meves tasques"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Error! No podeu crear tasques recursives."
 
 #. module: project
 #: field:project.task,company_id:0
@@ -188,22 +191,22 @@ msgstr "Companyia"
 #. module: project
 #: field:project.installer,project_scrum:0
 msgid "SCRUM"
-msgstr ""
+msgstr "SCRUM"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_planned_total_hours_graph
 msgid "Projects: Planned Vs Total hours"
-msgstr ""
+msgstr "Projectes: Hores planficadas - totals"
 
 #. module: project
 #: view:project.task.close:0
 msgid "Warn Message"
-msgstr ""
+msgstr "Missatge d'avís"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nom de la fase"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -214,12 +217,12 @@ msgstr "Canvia a pendent"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dies per obrir"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Canvia etapa"
 
 #. module: project
 #: view:project.project:0
@@ -229,7 +232,7 @@ msgstr "Nou projecte basat en plantilla"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Error! No podeu assignar un escalat al mateix projecte."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -240,25 +243,25 @@ msgstr "Molt urgent"
 #. module: project
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Usuari al que vol delegar aquesta tasca."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 #: field:task.by.days,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dia"
 
 #. module: project
-#: code:addons/project/project.py:571
+#: code:addons/project/project.py:584
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "La tasca '%s' està realitzada"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_close
 msgid "Project Close Task"
-msgstr ""
+msgstr "Tasca de tancament de projecte"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -275,7 +278,7 @@ msgstr "Tasca"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Socis"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -289,7 +292,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Treball tasca projecte"
 
 #. module: project
 #: view:project.project:0
@@ -301,22 +304,22 @@ msgstr "Notes"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projecte - Hores restants"
 
 #. module: project
 #: view:project.project:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adreça de factura"
 
 #. module: project
 #: field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Resum de la tasca"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "No és una plantilla de tasca"
 
 #. module: project
 #: view:project.task:0
@@ -329,6 +332,8 @@ msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
 msgstr ""
+"Ajuda a generar factures basades en el temps utilitzat en les tasques, si "
+"s'ha activat en el projecte."
 
 #. module: project
 #: view:project.project:0
@@ -361,7 +366,7 @@ msgstr "Capçalera correu"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Configureu la seva aplicació de gestió de projectes"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -371,7 +376,7 @@ msgstr "Tasca realitzada"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Títol per la seva tasca de validació."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -388,12 +393,12 @@ msgstr "Tasca és completada"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -405,7 +410,7 @@ msgstr "Delega tasques a altre usuari"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar per..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -425,17 +430,17 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuaris"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "En proves"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Temps previst perquè l'usuari delegat tanqui aquesta tasca."
 
 #. module: project
 #: view:project.project:0
@@ -443,7 +448,7 @@ msgid "Reactivate Project"
 msgstr "Reactiva projecte"
 
 #. module: project
-#: code:addons/project/project.py:553
+#: code:addons/project/project.py:562
 #, python-format
 msgid "Task '%s' closed"
 msgstr "Tasca '%s' tancada"
@@ -476,7 +481,7 @@ msgstr "Data límit"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Canceŀla"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -490,51 +495,53 @@ msgstr "Empresa"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Error! No podeu crear comptes analítics recursius."
 
 #. module: project
-#: code:addons/project/project.py:225
-#: code:addons/project/project.py:246
+#: code:addons/project/project.py:222
+#: code:addons/project/project.py:243
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (còpia)"
 
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Controla i ajuda als treballadors a codificar i validar els seus horaris i "
+"assistències."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "Nº de tasques"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Previ"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Re-avaluar tasca"
 
 #. module: project
 #: field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Assignat a"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Data parada: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "No podeu tenir dos usuaris amb el mateix identificador!"
 
 #. module: project
 #: view:project.project:0
@@ -549,7 +556,7 @@ msgstr "Plantilla"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Specification"
-msgstr ""
+msgstr "Especificació"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -559,12 +566,12 @@ msgstr "Els meus projectes"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Error! No es pot crear companyies recursives."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Següent"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -575,7 +582,7 @@ msgstr "Des de estat esborrany, es converteix en estat obert."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "Nº de dies"
 
 #. module: project
 #: help:project.task,active:0
@@ -584,6 +591,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Aquest camp es calcula automàticament i té el mateix comportament que el "
+"camp booleà 'actiu': Si la tasca està vinculada a una plantilla o a un "
+"projecte no activat, s'ocultaran tret que es pregunti específicament."
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -605,7 +615,7 @@ msgstr "Tasca del projecte"
 #. module: project
 #: view:project.installer:0
 msgid "Methodologies"
-msgstr ""
+msgstr "Metodologies"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -615,7 +625,7 @@ msgstr "Calculat com: Temps dedicat + Temps restant."
 #. module: project
 #: help:project.task.close,partner_email:0
 msgid "Email Address of Customer"
-msgstr ""
+msgstr "Adreça de correu electrònic del client."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -626,23 +636,23 @@ msgstr "Hores reals"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Títol de la tasca de validació"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Re-avalua"
 
 #. module: project
-#: code:addons/project/project.py:531
+#: code:addons/project/project.py:539
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Envia email després de tancar la tasca"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Retard sobrepassat"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -680,12 +690,12 @@ msgstr "Temps estimat"
 #: code:addons/project/wizard/project_task_close.py:86
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Tasca '%s' tancada"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "No hi ha tasques assignades als usuaris"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -693,6 +703,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma de les hores planificades de totes les tasques relacionades amb aquest "
+"projecte i els seus projectes fills."
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -712,7 +724,7 @@ msgstr "Informació extra"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juliol"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -727,7 +739,7 @@ msgid "Starting Date"
 msgstr "Data d'inici"
 
 #. module: project
-#: code:addons/project/project.py:267
+#: code:addons/project/project.py:264
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -741,7 +753,7 @@ msgstr "Projectes"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -750,12 +762,16 @@ msgid ""
 "task, up to the closing of the task or issue. You will use these stages in "
 "order to track the progress in solving a task or an issue."
 msgstr ""
+"Definiu els passos que s'utilitzaran en el projecte des de la creació de la "
+"tasca, fins al tancament de la tasca o incidència. Utilitzarà aquestes fases "
+"amb la finalitat de seguir el progrés en la solució d'una tasca o una "
+"incidència."
 
 #. module: project
-#: code:addons/project/project.py:622
+#: code:addons/project/project.py:635
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "La tasca '%s' està oberta."
 
 #. module: project
 #: view:project.task:0
@@ -765,12 +781,12 @@ msgstr "Dates"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Nou títol de la tasca delegada a l'usuari."
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -778,11 +794,13 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Estan disponibles diverses aplicacions d'OpenERP per gestionar els seus "
+"projectes amb diversos nivells de control i flexibilitat."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projecte - Hores planificades i totals"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -804,7 +822,7 @@ msgstr "Retard hores"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Anàlisi de tasques"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -820,7 +838,7 @@ msgstr "Delega"
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Plantilles de projectes"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -840,7 +858,7 @@ msgstr "Projecte"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Evalua"
 
 #. module: project
 #: view:board.board:0
@@ -851,7 +869,7 @@ msgstr "El meu taulell"
 #: code:addons/project/wizard/project_task_close.py:79
 #, python-format
 msgid "Please specify the email address of Project Manager."
-msgstr ""
+msgstr "Indiqueu l'adreça de correu electrònic del responsable del projecte."
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
@@ -862,13 +880,13 @@ msgstr "Projectes"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agost"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Delega tasca de projecte"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -885,12 +903,12 @@ msgstr "Tasques"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Parent"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delega tasca"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -904,21 +922,30 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Una tasca representa un treball que ha de realitzar-se. Cada usuari treballa "
+"en la seva pròpia llista de tasques, on pot registrar el seu treball de la "
+"tasca en hores. Pot treballar i tancar la tasca ell mateix o delegar-la a un "
+"altre usuari. Si delega una tasca a un altre usuari, obté una nova tasca en "
+"estat pendent, que es tornarà a obrir quan hagi de revisar el treball "
+"realitzat. Si instal·leu el mòdul project_timesheet, el treball de les "
+"tasques pot facturar-se sobre la base de la configuració del projecte. Amb "
+"el mòdul project_mrp, les comandes de venda poden crear tasques "
+"automàticament quan es confirmen."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Setembre"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Desembre"
 
 #. module: project
 #: field:project.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imatge"
 
 #. module: project
 #: field:project.task,progress:0
@@ -934,6 +961,11 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Si la tasca s'ha creat, l'estat és 'Esborrany'.\n"
+" Si la tasca s'inicia, l'estat es converteix 'En progrés'.\n"
+" Si és necessària una revisió, la tasca està en estat 'Pendent'.             "
+"                     \n"
+" Si la tasca està acabada, l'estat canvia a 'Realitzada'."
 
 #. module: project
 #: help:project.task,progress:0
@@ -955,7 +987,7 @@ msgstr "Tasques de projecte"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Fase de la Tasca"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -979,19 +1011,19 @@ msgstr "Estat: %(state)s"
 #. module: project
 #: field:project.installer,project_long_term:0
 msgid "Long Term Planning"
-msgstr ""
+msgstr "Planificació llarg termini"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data d'inici"
 
 #. module: project
 #: view:project.task:0
 #: field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Tasques pare"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -1001,12 +1033,12 @@ msgstr "Avisa empresa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Any  "
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Facturació"
 
 #. module: project
 #: view:project.task:0
@@ -1016,13 +1048,13 @@ msgstr "Informació"
 #. module: project
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
-msgstr ""
+msgstr "Ajuda als comptables a gestionar pressupostos analítics i creuats."
 
 #. module: project
 #: field:project.task,priority:0
 #: field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritat"
 
 #. module: project
 #: view:project.project:0
@@ -1032,17 +1064,17 @@ msgstr "Administració"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "projecte.tasca.reavaluar"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "La meva tasca"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Membre"
 
 #. module: project
 #: view:project.task:0
@@ -1052,7 +1084,7 @@ msgstr "Tasques de projecte"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Error! No podeu crear membres associats recursius."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1074,7 +1106,7 @@ msgstr "Baixa"
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Rendiment"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1102,18 +1134,18 @@ msgstr "Pendent"
 #. module: project
 #: view:project.task:0
 msgid "Task Edition"
-msgstr ""
+msgstr "Edició de tasca"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Fases"
 
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: project
 #: view:project.project:0
@@ -1127,11 +1159,13 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Nou estat de la seva pròpia tasca. S'obrirà automàticament en estat "
+"'Pendent' quan la tasca delegada es tanqui."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juny"
 
 #. module: project
 #: help:project.installer,project_scrum:0
@@ -1139,12 +1173,14 @@ msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
 msgstr ""
+"Implementa i segueix els conceptes i tipus de tasques definits en la "
+"metodologia SCRUM."
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dies per al tancament"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
@@ -1154,7 +1190,6 @@ msgstr "Taulell de projectes"
 
 #. module: project
 #: view:project.project:0
-#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr "Projecte pare"
 
@@ -1171,23 +1206,23 @@ msgstr "Defineix els requeriments i fixa les hores previstes."
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres estesos..."
 
 #. module: project
 #: field:project.task.close,partner_email:0
 msgid "Customer Email"
-msgstr ""
+msgstr "Correu electrònic del client"
 
 #. module: project
-#: code:addons/project/project.py:190
+#: code:addons/project/project.py:187
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "El projecte '%s' ha estat tancat."
 
 #. module: project
 #: view:project.task:0
@@ -1197,12 +1232,12 @@ msgstr "Edició de tasca"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project
 #: help:project.task.close,manager_warn:0
 msgid "Warn Manager by Email"
-msgstr ""
+msgstr "Avisa al responsable per correu electrònic"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1212,7 +1247,7 @@ msgstr "Obre tasca"
 #. module: project
 #: field:project.task.close,manager_email:0
 msgid "Manager Email"
-msgstr ""
+msgstr "Correu electrònic del administrador"
 
 #. module: project
 #: help:project.project,active:0
@@ -1220,11 +1255,12 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Si el camp actiu es desmarca, permet ocultar el projecte sense eliminar-ho."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Companyies"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1232,10 +1268,10 @@ msgid "When task is completed, it will come into the done state."
 msgstr "Quan es completa una tasca, canvia a l'estat Realitzada."
 
 #. module: project
-#: code:addons/project/project.py:212
+#: code:addons/project/project.py:209
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "El projecte '%s' ha estat obert."
 
 #. module: project
 #: field:project.task.work,date:0
@@ -1245,7 +1281,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Taullell"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -1253,6 +1289,8 @@ msgid ""
 "Error! The currency has to be the same as the currency of the selected "
 "company"
 msgstr ""
+"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+"seleccionada."
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:79
@@ -1271,12 +1309,12 @@ msgstr "Projectes d'usuari"
 #. module: project
 #: field:project.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progrés de la configuració"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delega"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:91
@@ -1289,7 +1327,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Número de dies per obrir la tasca."
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1299,7 +1337,7 @@ msgstr "Delegat a"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Històric"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1314,7 +1352,7 @@ msgstr "Tasca delegada"
 #. module: project
 #: field:project.installer,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Aconsegueix les coses acabades (GTD)"
 
 #. module: project
 #: help:project.project,members:0
@@ -1322,11 +1360,14 @@ msgid ""
 "Project's member. Not used in any computation, just for information purpose, "
 "but a user has to be member of a project to add a the to this project."
 msgstr ""
+"Membre del projecte. No s'utilitza en cap càlcul, només amb finalitat "
+"informativa, però un usuari ha de ser membre d'un projecte per afegir-lo al "
+"projecte."
 
 #. module: project
 #: help:project.task.close,partner_warn:0
 msgid "Warn Customer by Email"
-msgstr ""
+msgstr "Avisa al client per correu electrònic."
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -1338,6 +1379,13 @@ msgid ""
 "    * Members list of project\n"
 "    "
 msgstr ""
+"El mòdul de gestió de projectes administra projectes multi-nivell, tasques,\n"
+"treballs realitzat en les tasques, ... És capaç de fer la planificació, "
+"ordenar les tasques, ...\n"
+" El taulell pels membres de projectes que inclou:\n"
+"    * Llista de les meves tasques obertes\n"
+"    * Llista dels membres del projecte\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -1369,9 +1417,13 @@ msgid ""
 "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."
 msgstr ""
+"Aquest informe li permet analitzar el rendiment dels seus projectes i "
+"usuaris. Podeu analitzar la quantitat de tasques, les hores invertides en "
+"comparació de les hores previstes, el número mitjà de dies per obrir o "
+"tancar una tasca, etc"
 
 #. module: project
-#: code:addons/project/project.py:582
+#: code:addons/project/project.py:595
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr "Tasca '%s' en progrés"
@@ -1415,7 +1467,7 @@ msgstr "Cancel·la"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Tanca"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1424,7 +1476,7 @@ msgid "Open"
 msgstr "Obert"
 
 #. module: project
-#: code:addons/project/project.py:121
+#: code:addons/project/project.py:118
 #, python-format
 msgid ""
 "You can not delete a project with tasks. I suggest you to deactivate it."
@@ -1448,7 +1500,7 @@ msgstr "En progrés"
 #: code:addons/project/wizard/project_task_close.py:82
 #, python-format
 msgid "Please specify the email address of Customer."
-msgstr ""
+msgstr "Introdueixi l'adreça de correu electrònic del client."
 
 #. module: project
 #: view:project.task:0
@@ -1459,22 +1511,22 @@ msgstr "Reactiva"
 #: model:ir.actions.act_window,name:project.action_project_task_close
 #: view:project.task.close:0
 msgid "Send Email"
-msgstr ""
+msgstr "Envia Email"
 
 #. module: project
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Activitat actual"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Cerca projecte"
 
 #. module: project
 #: help:project.installer,project_gtd:0
@@ -1482,18 +1534,21 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"GTD és una metodologia per a organitzar-vos eficaçment vosaltres mateixos i "
+"les vostres tasques. Aquest mòdul integra completament el principio de GTD "
+"amb la gestió de projectes d'OpenERP."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projecte vs hores"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Current"
-msgstr ""
+msgstr "Actiu"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1510,7 +1565,7 @@ msgstr "Avisa responsable"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Data límit sobrepassada"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1518,6 +1573,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma de les hores utilitzades en totes les tasques relacionades amb aquest "
+"projecte i els seus projectes fills."
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1525,11 +1582,13 @@ msgid ""
 "Computed as difference of the time estimated by the project manager and the "
 "real time to close the task."
 msgstr ""
+"Calculat com la diferència del temps previst pel responsable del projecte i "
+"el temps real per tancar la tasca."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Re-avalua tasca"
 
 #. module: project
 #: help:project.installer,project_long_term:0
@@ -1537,21 +1596,23 @@ msgid ""
 "Enables long-term projects tracking, including multiple-phase projects and "
 "resource allocation handling."
 msgstr ""
+"Permet el seguiment de projectes a llarg termini, incloent projectes de "
+"múltiples fases i la gestió d'assignació de recursos."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Desenvolupament"
 
 #. module: project
 #: field:project.installer,project_timesheet:0
 msgid "Bill Time on Tasks"
-msgstr ""
+msgstr "Factura a partir de tasques"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Les meves hores restants del projecte"
 
 #. module: project
 #: field:project.task,description:0
@@ -1576,7 +1637,7 @@ msgstr "Urgent"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maig"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1586,14 +1647,14 @@ msgstr "Validació de tasca"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Tasques totals"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Les meves tasques delegades"
 
 #. module: project
 #: view:project.project:0
@@ -1604,7 +1665,7 @@ msgstr "Tasca: %(name)s"
 #: model:ir.actions.act_window,name:project.action_project_installer
 #: view:project.installer:0
 msgid "Project Application Configuration"
-msgstr ""
+msgstr "Configuració aplicació de projectes"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1625,7 +1686,7 @@ msgstr "Els meus comptes a facturar"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Gener"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1647,34 +1708,36 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma del total d'hores de totes les tasques relacionades amb aquest projecte "
+"i els seus projectes fills."
 
 #. module: project
 #: help:project.task.close,manager_email:0
 msgid "Email Address of Project's Manager"
-msgstr ""
+msgstr "Adreça de correu electrònic del responsable del projecte"
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 #. module: project
 #: view:project.project:0
 #: view:project.task:0
 msgid "End Date"
-msgstr ""
+msgstr "Data de finalització"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrer"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_task_by_days_graph
 #: model:ir.model,name:project.model_task_by_days
 #: view:task.by.days:0
 msgid "Task By Days"
-msgstr ""
+msgstr "Tasca per dies"
 
 #. module: project
 #: code:addons/project/wizard/project_task_close.py:111
@@ -1682,16 +1745,18 @@ msgstr ""
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
+"No es pot enviar el correu! Comproveu els ids de l'email i els valors de "
+"configuració del smtp"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
 msgid "Warn Customer"
-msgstr ""
+msgstr "Avisa client"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Editeu"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1702,27 +1767,27 @@ msgstr "Codifiqueu vostres hores de treball."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Número de dies per tancar la tasca."
 
 #. module: project
 #: view:board.board:0
 msgid "My Projects: Planned vs Total Hours"
-msgstr ""
+msgstr "Els meus projectes: Planificats - Hores totals"
 
 #. module: project
 #: model:ir.model,name:project.model_project_installer
 msgid "project.installer"
-msgstr ""
+msgstr "projecte.instal·lador"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1733,7 +1798,7 @@ msgstr "Hores dedicades"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Varis"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1748,13 +1813,13 @@ msgstr "Unitat de temp projecte"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Hores dedicades"
 
 #. module: project
-#: code:addons/project/project.py:665
+#: code:addons/project/project.py:678
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "La tasca '%s' està pendent."
 
 #. module: project
 #: field:project.task,total_hours:0
@@ -1767,33 +1832,33 @@ msgstr "Total hores"
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Indica l'ordre de seqüència quan es mostra una llista de projectes."
 
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Usuaris"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Tasques sobrepassades"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Merge"
-msgstr ""
+msgstr "Combina"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_vs_remaining_hours_graph
 #: view:project.vs.hours:0
 msgid "Remaining Hours Per Project"
-msgstr ""
+msgstr "Hores restants per projecte"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1816,6 +1881,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Un projecte cté un conjunt de tasques o incidències que seran realitzades "
+"pels recursos assignats a ell. Un projecte pot estructurar-se "
+"jeràrquicament, com a fill d'un projecte pare. Això li permet dissenyar "
+"grans estructures de projecte amb diferents fases repartides en el cicle de "
+"vida del projecte. Cada usuari pot establir el seu projecte per defecte en "
+"les seves pròpies preferències per filtrar automàticament les tasques o "
+"incidències en les quals normalment treballa. Si opteu per facturar el temps "
+"utilitzat en una tasca del projecte, podeu trobar les tasques del projecte a "
+"facturar en la secció de facturació."
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1828,7 +1902,7 @@ msgid "Validation State"
 msgstr "Estat de validació"
 
 #. module: project
-#: code:addons/project/project.py:602
+#: code:addons/project/project.py:615
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr "Tasca '%s' cancel·lada"
@@ -1844,27 +1918,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"El temps previst perquè pugui validar el treball realitzat per l'usuari a "
+"qui s'ha delegat aquesta tasca."
 
 #. module: project
 #: view:project.project:0
 msgid "Manager"
-msgstr ""
+msgstr "Director"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data de creació"
 
 #. module: project
-#: code:addons/project/project.py:610
+#: code:addons/project/project.py:623
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "La tasca '%s' està cancel·lada."
 
 #. module: project
 #: view:project.task.close:0
 msgid "_Send"
-msgstr ""
+msgstr "_Envia"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1874,18 +1950,18 @@ msgstr "Resum del treball"
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "títol"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
-msgstr ""
+msgstr "Sincronitza automàticament tasques de projecte i casos CRM."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,type_ids:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Fases de tasques"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1901,7 +1977,7 @@ msgstr "Peu correu"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Pressupostos"
 
 #, python-format
 #~ msgid ""
@@ -2215,102 +2291,3 @@ msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Estat"
-
-#~ msgid "My project's planning"
-#~ msgstr "La meva planificació de projectes"
-
-#~ msgid "Board for project users"
-#~ msgstr "Taulell per a usuaris de projectes"
-
-#~ msgid "Pipeline of tasks"
-#~ msgstr "Encadenament de tasques"
-
-#~ msgid "My Planning"
-#~ msgstr "La meva planificació"
-
-#~ msgid "Project Manager Dashboard"
-#~ msgstr "Taulell responsable de projectes"
-
-#~ msgid "My Deadlines"
-#~ msgstr "Les meves dates límit"
-
-#~ msgid "User's timesheets"
-#~ msgstr "Fulls de serveis d'usuari"
-
-#~ msgid "Project manager board"
-#~ msgstr "Taulell del responsable de projectes"
-
-#~ msgid "My tasks board"
-#~ msgstr "El meu taulell de tasques"
-
-#~ msgid "My user's pipeline"
-#~ msgstr "El meu encadenament de tasques d'usuari"
-
-#~ msgid "My Timesheet"
-#~ msgstr "La meva agenda"
-
-#~ msgid "Tasks finished by project (this month)"
-#~ msgstr "Tasques finalitzades per projecte (aquest mes)"
-
-#~ msgid "Tasks Closed by Project and User"
-#~ msgstr "Tasques tancades per projecte i usuari"
-
-#~ msgid "Tasks finished by project and user (this month)"
-#~ msgstr "Tasques finalitzades per projecte i usuari (aquest mes)"
-
-#~ msgid "Task Closed"
-#~ msgstr "Tasca tancada"
-
-#~ msgid "Tasks by Project"
-#~ msgstr "Tasques per Projecte"
-
-#~ msgid "Sales Management - Reporting"
-#~ msgstr "Informes - Gestió de projectes"
-
-#~ msgid "User"
-#~ msgstr "Usuari"
-
-#~ msgid "Tasks by Project and User"
-#~ msgstr "Tasques per projecte i usuari"
-
-#~ msgid "This Month"
-#~ msgstr "Aquest mes"
-
-#~ msgid "Tasks by projects and users"
-#~ msgstr "Tasques per projectes i usuaris"
-
-#~ msgid "Avg Closing Delay"
-#~ msgstr "Mitjana retard de tancament"
-
-#~ msgid "Tasks by project"
-#~ msgstr "Tasques per projecte"
-
-#~ msgid "Tasks Closed by Project"
-#~ msgstr "Tasques tancades per projecte"
-
-#~ msgid "Tasks by User"
-#~ msgstr "Tasques per usuari"
-
-#~ msgid "No Task"
-#~ msgstr "No hi ha tasca"
-
-#~ msgid "Report on tasks by user for projects"
-#~ msgstr "Informe de tasques per usuari per projectes"
-
-#~ msgid "Timesheet / Task Hours Per Month"
-#~ msgstr "Temps / Hores de tasques per mes"
-
-#~ msgid "Reporting"
-#~ msgstr "Informe"
-
-#~ msgid ""
-#~ "Gives statistics on tasks by user on projects to check the pipeline of users."
-#~ msgstr ""
-#~ "Proporciona estadístiques de tasques per usuari en projectes per a comprovar "
-#~ "el treball encadenat dels usuaris."
-
-#~ msgid "Task Closed Within Past 15 Days"
-#~ msgstr "Tasques tancades en els últims 15 dies"
-
-#~ msgid "Task Hours"
-#~ msgstr "Hores de tasca"
diff --git a/addons/project/project.py b/addons/project/project.py
index b1461da424c..622b5ffc2c2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -26,10 +26,10 @@ from datetime import datetime, date
 from tools.translate import _
 from osv import fields, osv
 
-class project_project(osv.osv):
-    _name = 'project.project'
-    
-project_project()    
+# I think we can remove this in v6.1 since VMT's improvements in the framework ?
+#class project_project(osv.osv):
+#    _name = 'project.project'
+#project_project()
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -39,13 +39,12 @@ class project_task_type(osv.osv):
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
         'sequence': fields.integer('Sequence'),
+        'project_default': fields.boolean('Common to All Projects', help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
     }
-
     _defaults = {
         'sequence': 1
     }
-
 project_task_type()
 
 class project(osv.osv):
@@ -150,11 +149,16 @@ class project(osv.osv):
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
      }
+    def _get_type_common(self, cr, uid, context):
+        ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)
+        return ids
+
     _order = "sequence"
     _defaults = {
         'active': True,
         'priority': 1,
         'sequence': 10,
+        'type_ids': _get_type_common
     }
 
     # TODO: Why not using a SQL contraints ?
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a2df2e2e76c..d78f208526a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -15,10 +15,9 @@
             <field name="object">project.task</field>
         </record>
         
-
         <!--
-		Resource: project.project
-		-->
+        Resource: project.project
+        -->
 
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
@@ -26,5 +25,29 @@
         </record>
         <function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
 
+
+        <!-- Task Stages -->
+        <record id="project_tt_specification" model="project.task.type">
+            <field name="sequence">1</field>
+            <field name="name">Design</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_development" model="project.task.type">
+            <field name="sequence">2</field>
+            <field name="name">Development</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_testing" model="project.task.type">
+            <field name="sequence">3</field>
+            <field name="name">Testing</field>
+            <field name="project_default" eval="1"/>
+        </record>
+        <record id="project_tt_merge" model="project.task.type">
+            <field name="sequence">4</field>
+            <field name="name">Deployment</field>
+            <field name="project_default" eval="1"/>
+        </record>
+
+
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index a2a5bb8c17c..999d16c07cc 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -221,26 +221,8 @@
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.uom_hour"></field>
         </record>
-
-        <!-- Task Types -->
-        <record id="project_tt_specification" model="project.task.type">
-            <field name="sequence">1</field>
-            <field name="name">Specification</field>
-        </record>
-        <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">2</field>
-            <field name="name">Development</field>
-        </record>
-        <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">3</field>
-            <field name="name">Testing</field>
-        </record>
-        <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">4</field>
-            <field name="name">Merge</field>
-        </record>
-
         <!-- Projects -->
+
         <!-- <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 85cde448c6d..435bf64fe8d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -63,7 +63,6 @@
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
-                                    <field name="address_id"/>
                                 </tree>
                             </field>
                         </page>
@@ -248,7 +247,7 @@
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
+                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -397,7 +396,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
@@ -482,8 +481,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Stage">
+                    <group colspan="4" col="6">
                     <field name="name" select="1"/>
+                    <field name="project_default"/>
                     <field name="sequence"/>
+                    </group>
                     <separator string="Description" colspan="4"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
@@ -546,9 +548,9 @@
           <field name="inherit_id" ref="base.view_users_form"/>
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
-              <xpath expr="/form/notebook" position="before">
+              <group name="default_filters" position="inside">
                    <field name="context_project_id"/>
-              </xpath>
+              </group>
           </field>
      </record>
 
@@ -559,9 +561,9 @@
          <field name="type">form</field>
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
-            <page string="Current Activity" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
-            </page>
+            <group name="default_filters" position="inside">
+                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
+            </group>
        </field>
     </record>
     <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index b51a5a9c89a..62f74f51d1b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
-    </record>
-
     <record id="group_project_user" model="res.groups">
         <field name="name">Project / User</field>
     </record>
 
+    <record id="group_project_manager" model="res.groups">
+        <field name="name">Project / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
+    </record>
+
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 010bba9e52b..627864820f6 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -84,8 +84,8 @@ class project_task_close(osv.osv_memory):
             elif data.manager_warn or data.partner_warn:
                 project = task.project_id
                 subject = _("Task '%s' Closed") % task.name
-                if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
-                    from_adr = task.user_id.address_id.email
+                if task.user_id  and task.user_id.user_email:
+                    from_adr = task.user_id.user_email
                     signature = task.user_id.signature
                 else:
                     raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))