From b805979e924692d975ce7da4d92c3b5b20ef2dc3 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 12:31:57 +0530
Subject: [IMP]project: set one selection field and and some methods for
 followers or members

bzr revid: dbr@tinyerp.com-20120528070157-8lo7c1d3owzbmhaq
---
 addons/project/project.py                    | 40 +++++++++++++++++++++++++++-
 addons/project/project_view.xml              |  1 +
 addons/project/security/project_security.xml |  5 ++++
 3 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 0b23196a67f..cc5da2c15dc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -67,6 +67,35 @@ class project(osv.osv):
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        list = []
+        project_ids = self.browse(cr, uid, ids)
+        groups = self.pool.get('res.groups')
+        group_id = groups.search(cr, uid, [('name', '=', 'Followers')], context=context)
+        groups_users = groups.browse(cr, uid, group_id)[0].users
+        for project_id in project_ids:
+           select = vals.get('privacy_visility') or project_id.privacy_visility or False
+           members = vals.get('members') or project_id.members or False
+           if select=='follower':
+             if members:
+               for member in members:
+                   list.append(member.id)
+               followers = self.find_followers(cr, uid, ids, context)
+               for member_id in list:
+                   if not member_id in followers:
+                      self.message_subscribe(cr, uid, ids, [member_id], context=context)
+        return super(project, self).write(cr, uid, ids, vals, context=context)
+
+    def find_followers(self, cr, uid, ids, context=None):
+    	user=[]
+        sub_obj = self.pool.get('mail.subscription')
+        sub_id = sub_obj.search(cr, uid, [('res_model','=','project.project'),('res_id','in',ids)], context=context)
+        for follower_id in sub_obj.browse(cr, uid, sub_id):
+            user.append(follower_id.user_id.id)
+        return user
+
     def _complete_name(self, cr, uid, ids, name, args, context=None):
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
@@ -202,11 +231,20 @@ class project(osv.osv):
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'privacy_visility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visility', select=True),
      }
     
     def dummy(self, cr, uid, ids, context):
         return True
-       
+
+    def message_thread_followers(self, cr, uid, ids, context=None):
+        followers = super(project,self).message_thread_followers(cr, uid, ids, context=context)
+        for project in self.browse(cr, uid, followers.keys(), context=context):
+            project_followers = set(followers[project.id])
+            project_followers.add(project.user_id.user_email)
+            followers[project.id] = filter(None, project_followers)
+        return followers
+
     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
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 70cdac1efa0..5d2d29fb5d5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -41,6 +41,7 @@
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="progress_rate" widget="progressbar"/>
+                        <field name="privacy_visility"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2bfe967e675..fb9041681f2 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,6 +14,11 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="group_project_followers" model="res.groups">
+        <field name="name">Followers</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
+    </record>
+
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
-- 
cgit v1.2.3


From 707ece42609d2d10252f0f686f52e629e7bcea1e Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 15:14:10 +0530
Subject: [IMP]project: codr improvements

bzr revid: dbr@tinyerp.com-20120528094410-2ohyzscyqh51gxt9
---
 addons/project/project.py       | 33 ++++++++++++---------------------
 addons/project/project_view.xml |  2 +-
 2 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index cc5da2c15dc..aab101d62a3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -70,32 +70,23 @@ class project(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        list = []
-        project_ids = self.browse(cr, uid, ids)
-        groups = self.pool.get('res.groups')
-        group_id = groups.search(cr, uid, [('name', '=', 'Followers')], context=context)
-        groups_users = groups.browse(cr, uid, group_id)[0].users
-        for project_id in project_ids:
+        groups_pool = self.pool.get('res.groups')
+        group_id = groups_pool.search(cr, uid, [('name', '=', 'Followers')], context=context)
+        groups_users = groups_pool.browse(cr, uid, group_id, context)[0].users
+        for project_id in self.browse(cr, uid, ids, context):
+           if vals.get('members'):
+               members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
+           else:
+               members = project_id.members or False
            select = vals.get('privacy_visility') or project_id.privacy_visility or False
-           members = vals.get('members') or project_id.members or False
-           if select=='follower':
-             if members:
-               for member in members:
-                   list.append(member.id)
-               followers = self.find_followers(cr, uid, ids, context)
-               for member_id in list:
+           if select=='follower' and members:
+               member_list = [member.id for member in members]
+               followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
+               for member_id in member_list:
                    if not member_id in followers:
                       self.message_subscribe(cr, uid, ids, [member_id], context=context)
         return super(project, self).write(cr, uid, ids, vals, context=context)
 
-    def find_followers(self, cr, uid, ids, context=None):
-    	user=[]
-        sub_obj = self.pool.get('mail.subscription')
-        sub_id = sub_obj.search(cr, uid, [('res_model','=','project.project'),('res_id','in',ids)], context=context)
-        for follower_id in sub_obj.browse(cr, uid, sub_id):
-            user.append(follower_id.user_id.id)
-        return user
-
     def _complete_name(self, cr, uid, ids, name, args, context=None):
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5d2d29fb5d5..57c45c18856 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,7 +33,7 @@
                     <div class="oe_clear"/>
                 </div>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
+                    <group colspan="4" col="4">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="analytic_account_id" invisible="1" required="0"/>
                         <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-- 
cgit v1.2.3


From c81dcd768aba95c6f478df8f6344bd1aee773897 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 15:40:35 +0530
Subject: [IMP]project:Remove extra code

bzr revid: dbr@tinyerp.com-20120528101035-itsr2upflvx71n2e
---
 addons/project/project.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index aab101d62a3..47dc840e3c7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -70,9 +70,6 @@ class project(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
-        groups_pool = self.pool.get('res.groups')
-        group_id = groups_pool.search(cr, uid, [('name', '=', 'Followers')], context=context)
-        groups_users = groups_pool.browse(cr, uid, group_id, context)[0].users
         for project_id in self.browse(cr, uid, ids, context):
            if vals.get('members'):
                members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
-- 
cgit v1.2.3


From ecbf5fadf06980d18cf5229cb4bdb10a2fa39a8b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 16:21:10 +0530
Subject: [REM]project: No need followers group so removed it

bzr revid: dbr@tinyerp.com-20120528105110-ap0nzv1hjv5ylzfj
---
 addons/project/security/project_security.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index fb9041681f2..2bfe967e675 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,11 +14,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_project_followers" model="res.groups">
-        <field name="name">Followers</field>
-        <field name="category_id" ref="base.module_category_project_management"/>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
-- 
cgit v1.2.3


From 0e90703ad0d1727c7a4511e30f335c0a3667357c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 28 May 2012 18:00:54 +0530
Subject: [IMP]add boolean of project,projec_longterm,and project issue and
 create related project

bzr revid: sgo@tinyerp.com-20120528123054-ntp1u33q1iavwtej
---
 addons/project/project.py       | 26 +++++++++++++++++++++-----
 addons/project/project_view.xml | 16 ++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 0b23196a67f..51d254756f4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -198,10 +198,8 @@ class project(osv.osv):
         'warn_header': fields.text('Mail Header', help="Header 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)]}),
         '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)]}),
-        'use_tasks': fields.boolean('Use Tasks', help="Check this field if this project is aimed at managing tasks"),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
-        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
      }
     
     def dummy(self, cr, uid, ids, context):
@@ -217,7 +215,6 @@ class project(osv.osv):
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
-        'use_tasks': True,
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -1234,16 +1231,35 @@ class project_work(osv.osv):
 project_work()
 
 class account_analytic_account(osv.osv):
-
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
+    _columns = {
+        'use_tasks': fields.boolean('Tasks Management'),
+        'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+    }
+#    _defaults = {
+#        'use_tasks': True,
+#    }
+    
+    def project_create(self,cr,uid,analytic_account_id,vals,context=None):
+        res = {}
+        project_pool = self.pool.get('project.project')
+        project_id = project_pool.name_search(cr, uid, name=vals.get('name'))
+        if not project_id:
+            res['name'] = vals.get('name')
+            res['analytic_account_id'] = analytic_account_id
+            project_pool.create(cr, uid, res, context=context)
+        return True
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
-        return super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if vals.get('use_tasks', False):
+            self.project_create(cr, uid, analytic_account_id, vals, context)
+        return analytic_account_id
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 70cdac1efa0..29704cf3318 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -600,6 +600,22 @@
                 </search>
             </field>
         </record>
+        
+        <record id="analytic_account_inherited_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.inherit</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field eval="18" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//separator[@name="project_sep"]' position='replace'>
+                    <separator colspan="2" string="Project" name="project_sep"/>
+                </xpath>
+            	<xpath expr='//group[@name="project"]' position='inside'>
+                    <field name="use_tasks" />
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">Tasks</field>
-- 
cgit v1.2.3


From 29835b5e078d0abd328306fee2781d9bef2f7863 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 28 May 2012 18:58:38 +0530
Subject: [IMP]project: Set record rules

bzr revid: dbr@tinyerp.com-20120528132838-wyzz7r9dwmfgv36t
---
 addons/project/security/project_security.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2bfe967e675..2b4c87671b1 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -36,6 +36,20 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule" id="project_public_rule">
+        <field name="name">Public_projects</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('privacy_visility','=','public'),('privacy_visility','=', False)]</field>
+    </record>
+
+    <record model="ir.rule" id="project_private_members_rule">
+        <field name="name">private Members</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('privacy_visility','=','follower'),('members','in',[user.id])]</field>
+    </record>
+
     <record model="ir.rule" id="task_comp_rule">
         <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
-- 
cgit v1.2.3


From 87040b2390a496a96c2c69e09cfb2f19769b1f27 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:29:34 +0530
Subject: [IMP]:project:improved project view

bzr revid: apa@tinyerp.com-20120530065934-qpo4hsv4pcyhngjr
---
 addons/project/project_view.xml           | 36 +++++++++++++++++++------------
 addons/project/static/src/css/project.css |  3 +++
 2 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..a7291e9f7d3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,21 +33,29 @@
                     <div class="oe_clear"/>
                 </div>
                 <sheet string="Project" layout="auto">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="analytic_account_id" invisible="1" required="0"/>
-                        <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                    <group col="4" colspan="4">
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <field name="name" string="Project Name" select="1"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
+                            <!--<field name="progress_rate" widget="progressbar"/>-->
+                        </group>
+                        <group col="2" colspan="2" class="oe_form_group_label_border">
+                            <table>
+                                <tr name="use_tasks">
+                                    <th width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
+                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                            </table>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <group col="2" colspan="2" name="kanban">
-                                <separator colspan="2" string="Project Management"/>
-                                    <field name="use_tasks"/>
-                            </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
@@ -63,7 +71,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
+                        <page string="Team">
                             <field colspan="4" name="members" nolabel="1">
                                 <tree string="Members">
                                     <field name="name"/>
@@ -72,7 +80,7 @@
                             </field>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
+                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ebab44e225a..7d589675a4a 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,3 +1,6 @@
+.oe_btn_width {
+    width: 100px;
+}
 .oe_kanban_project {
     width: 300px;
 }
-- 
cgit v1.2.3


From 4fc454658fdb4ed9370dcb94bb1706b3609341da Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 12:45:41 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530071541-yyriflh6u737zd9b
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a7291e9f7d3..7da0277c73f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,7 +39,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
-                            <!--<field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>-->
+                            <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
@@ -49,7 +49,7 @@
                                 <tr name="use_tasks">
                                     <th width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From 63cf0f61906dcc1726a5e4596666556975c7902c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 13:07:28 +0530
Subject: [IMP]:project:improved view and code.

bzr revid: apa@tinyerp.com-20120530073728-1rij0covlh0odtl5
---
 addons/project/project_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7da0277c73f..34c228b4c53 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,10 +45,13 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table>
-                                <tr name="use_tasks">
-                                    <th width="140px">Tasks Management</th>
-                                    <td><field name="use_tasks" nolabel="1"/></td>
+                            <table border="1">
+                                <tr name="use_tasks_row">
+                                    <td>
+                                        <group class="oe_form_group_label_border">
+                                            <field name="use_tasks"/>
+                                        </group>
+                                    </td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
-- 
cgit v1.2.3


From 04d5c34200672f9f83c78bbf99593dc5e01123e2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:20:24 +0530
Subject: [IMP]:improved project view as new style and format

bzr revid: apa@tinyerp.com-20120530085024-ngddwwoiyonc875c
---
 addons/project/project_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 34c228b4c53..399f325667d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,13 +45,10 @@
                             <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table border="1">
+                            <table border="0">
                                 <tr name="use_tasks_row">
-                                    <td>
-                                        <group class="oe_form_group_label_border">
-                                            <field name="use_tasks"/>
-                                        </group>
-                                    </td>
+                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
+                                    <td><field name="use_tasks" nolabel="1"/></td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                             </table>
-- 
cgit v1.2.3


From 36d176b83de7f7edbd88adfdb2e55708ea914f5d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 14:49:29 +0530
Subject: improved project view

bzr revid: apa@tinyerp.com-20120530091929-i6c5vluk9osccd2a
---
 addons/project/project_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 399f325667d..2835c5f542f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,6 +11,15 @@
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -170,15 +179,6 @@
             </field>
         </record>
         
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
-- 
cgit v1.2.3


From 41161a904c7c7ecb6872759d8c979e8a8a466c66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 16:01:59 +0530
Subject: [IMP]analytic: Add members field

bzr revid: dbr@tinyerp.com-20120530103159-n9yw01h99ap56yfw
---
 addons/project/project.py       | 4 ++--
 addons/project/project_view.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 51d254756f4..0dbbfcfd689 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -170,8 +170,8 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
-        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
-            help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        #'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+        #    help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..847449be746 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -64,7 +64,7 @@
                             </group>
                         </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -577,6 +577,7 @@
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
+                        <field name="project_id" invisible="1"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
                             <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-- 
cgit v1.2.3


From 3b7f1698d9856eba10e46acacd5ab8bb7e0237e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 18:09:13 +0530
Subject: [IMP]project: Set members field in proper module

bzr revid: dbr@tinyerp.com-20120530123913-e7u4m3m3u6lgiop6
---
 addons/project/project.py       | 2 ++
 addons/project/project_view.xml | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 0dbbfcfd689..3bda5ad128e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1236,6 +1236,8 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+            states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
     }
 #    _defaults = {
 #        'use_tasks': True,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 50eb9075ffc..737a4c01b02 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -621,6 +621,9 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <field name="members" colspan="4" nolabel="1"/>
+                </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>
-- 
cgit v1.2.3


From 6f42929b395b461cab5c71cbc28c2d7d58fb99a0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 30 May 2012 18:42:17 +0530
Subject: [IMP]:improved view

bzr revid: apa@tinyerp.com-20120530131217-91o2ic0hfakl8uk7
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 737a4c01b02..8b9b6580473 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -80,9 +80,8 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Members">
+                        <page string="Team">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
-
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -622,6 +621,7 @@
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
+                    <separator colspan="4" string="Team"/>
                     <field name="members" colspan="4" nolabel="1"/>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
-- 
cgit v1.2.3


From 498549e8e5d14f53b07cbfb7ec8181b7fc313a5d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 31 May 2012 15:03:23 +0530
Subject: [IMP]account_analytic_analysis: Inherit project form view

bzr revid: dbr@tinyerp.com-20120531093323-wks6p7arbyoam8t9
---
 addons/project/project.py       | 1 +
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 3bda5ad128e..4c646037c17 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1236,6 +1236,7 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'company_uom_id1': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
     }
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8b9b6580473..f784c9db00b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -80,7 +80,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page string="Team">
+                        <page name="team" string="Team">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
-- 
cgit v1.2.3


From 818977e167b98bd0fbd02da0821998a1f9b651b4 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 31 May 2012 15:16:19 +0530
Subject: [REM]project: remove extra field

bzr revid: dbr@tinyerp.com-20120531094619-bvi3o0skj6m713u4
---
 addons/project/project.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 4c646037c17..3bda5ad128e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1236,7 +1236,6 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
-        'company_uom_id1': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
     }
-- 
cgit v1.2.3


From 10ffd100e109f3f4ab91e99b0bc90831db4bb542 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 31 May 2012 15:48:45 +0530
Subject: [IMP]:improved project view

bzr revid: apa@tinyerp.com-20120531101845-ee015dc62seai6va
---
 addons/project/project_view.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f784c9db00b..5f0a1ea5944 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,9 +112,6 @@
                         <page string="Tasks Stages">
                            <field nolabel="1" name="type_ids" colspan="4"/>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="description" nolabel="1"/>
-                        </page>
                     </notebook>
                     <newline/>
                 </sheet>
-- 
cgit v1.2.3


From 18f8ec4486d729d0776cc668c168e8705cb0b42b Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 1 Jun 2012 15:14:24 +0530
Subject: [IMP] project: add function to open attachments related to the
 project.

bzr revid: tpa@tinyerp.com-20120601094424-gs2k68izgcedpnx5
---
 addons/project/project.py       | 14 ++++++++++++++
 addons/project/project_view.xml |  5 +++++
 2 files changed, 19 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 3bda5ad128e..87097298bd2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -200,6 +200,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'),
+        'use_attachment':  fields.boolean('Tasks Management'),
      }
     
     def dummy(self, cr, uid, ids, context):
@@ -456,6 +457,19 @@ def Project():
                     }, context=context)
         return True
 
+    def open_attachment(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        return {
+            'name': 'Attachments',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'ir.attachment',
+            'domain': [('res_id','=',ids[0])],
+            'type': 'ir.actions.act_window',
+         }
+
     # ------------------------------------------------
     # OpenChatter methods and notifications
     # ------------------------------------------------
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5f0a1ea5944..d0282ded9cf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -60,6 +60,11 @@
                                     <td><field name="use_tasks" nolabel="1"/></td>
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
+                                <tr name="use_attachment_row">
+                                    <th style="border-right:1px solid #DDD;" width="140px">Attachment</th>
+                                    <td><field name="use_attachment" nolabel="1"/></td>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" attrs="{'invisible':[('use_attachment','=', 0)]}"/></td>
+                                </tr>
                             </table>
                         </group>
                     </group>
-- 
cgit v1.2.3


From 39e7e1320f6522fff681ef2d3fec4a12e1b934ce Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 1 Jun 2012 16:38:01 +0530
Subject: [IMP] improved code

bzr revid: tpa@tinyerp.com-20120601110801-htybml55338uhr6s
---
 addons/project/project.py       | 1 -
 addons/project/project_view.xml | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 87097298bd2..5044c0884b7 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -200,7 +200,6 @@ 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'),
-        'use_attachment':  fields.boolean('Tasks Management'),
      }
     
     def dummy(self, cr, uid, ids, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d0282ded9cf..c7b99b43dc8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -61,9 +61,9 @@
                                     <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
-                                    <th style="border-right:1px solid #DDD;" width="140px">Attachment</th>
-                                    <td><field name="use_attachment" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" attrs="{'invisible':[('use_attachment','=', 0)]}"/></td>
+                                    <th/>
+                                    <td/>
+                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="open_attachment" string="Attachments" type="object" /></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From a704f7bd8dc5a5035609eb73a5accb1e104d86f3 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Fri, 1 Jun 2012 17:07:18 +0200
Subject: [IMP] adapt task and issue views for portal users - give read access
 rights to group_portal_member on projet.task.type and project.task.work
 models - hide action buttons and priority fields in form and list views - a
 question remains: how to handle states and stages ?  state seems more
 revelant and simple to understand for portal users (and therefore should be
 shown through the statusbar widget) while stage is more interesing for
 internal organization

bzr revid: abo@openerp.com-20120601150718-dk49583g1tko118y
---
 addons/project/project_view.xml | 72 ++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 34 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d001af367c4..ab8dcf84831 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -51,7 +51,7 @@
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
+                                <field name="effective_hours" widget="float_time"/>
                                 <field name="resource_calendar_id"/>
                             </group>
                             <newline/>
@@ -128,7 +128,7 @@
                        </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
-                   <newline />
+                   <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
@@ -305,24 +305,26 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending"/>
-                        <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
-                        <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                states="pending,open,draft"/>
-                        <button name="do_cancel" string="Cancel" type="object"
-                                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"
-                                states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        <span groups="base.group_user">
+                            <button name="do_open" string="Start Task" type="object"
+                                    states="draft,pending"/>
+                            <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                    states="done,cancelled" context="{'button_reactivate':True}"/>
+                            <button name="do_pending" string="Pending" type="object"
+                                    states="open"/>
+                            <button name="action_close" string="Done" type="object"
+                                    states="draft,open,pending"/>
+                            <button name="do_draft" string="Draft" type="object"
+                                    states="cancel,done"/>
+                            <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
+                                    states="pending,open,draft"/>
+                            <button name="do_cancel" string="Cancel" type="object"
+                                    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"
+                                    states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                        </span>
                         <div class="oe_right">
                             <field name="stage_id" nolabel="1" widget="statusbar"/>
                         </div>
@@ -344,7 +346,7 @@
                                     name="planned_hours"
                                     widget="float_time"
                                     attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"									
+                                    groups="project.group_time_work_estimation_tasks"
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field
                                     name="effective_hours"
@@ -358,10 +360,10 @@
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="name" />
+                                    <field name="name"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
-                                    <field name="user_id" />
-                                    <field name="date" />
+                                    <field name="user_id"/>
+                                    <field name="date"/>
                                 </tree>
                             </field>
                         </page>
@@ -386,13 +388,13 @@
                         <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
                             <group colspan="2" col="2">
                                 <separator string="Planning" colspan="2"/>
-                                <field name="priority"/>
+                                <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
 
                             <separator string="Miscellaneous" colspan="4"/>
-                            <field name="partner_id" />
+                            <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <field name="state" groups="base.group_no_one"/>
                             <separator colspan="4" string="Notes"/>
@@ -415,7 +417,7 @@
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
-                    <field name="priority"/>
+                    <field name="priority" groups="base.group_user"/>
                     <field name="stage_id"/>
                     <field name="user_id"/>
                     <field name="user_email"/>
@@ -518,16 +520,18 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <button name="do_open" string="Start Task" type="object"
-                            states="draft,pending" icon="gtk-go-forward"/>
+                            states="draft,pending" icon="gtk-go-forward" groups="base.group_user"/>
                     <button name="action_close" string="Done" type="object"
-                            states="draft,open,pending" icon="gtk-apply"/>
+                            states="draft,open,pending" icon="gtk-apply" groups="base.group_user"/>
                     <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                            states="pending,open,draft" icon="terp-personal"/>
+                            states="pending,open,draft" icon="terp-personal" groups="base.group_user"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
                     <button name="stage_previous" string="Previous Stage" type="object"
-                            states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                            states="open,pending" icon="gtk-go-back" 
+                            attrs="{'invisible': [('stage_id','=', False)]}" groups="base.group_user"/>
                     <button name="stage_next" string="Next Stage" type="object"
-                            states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
+                            states="open,pending" icon="gtk-go-forward" 
+                            attrs="{'invisible': [('stage_id','=', False)]}" groups="base.group_user"/>
                     <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
@@ -589,8 +593,8 @@
                         <field name="name"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
-                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />
-                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
+                            <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
+                            <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
                         </field>
                     </group>
                     <newline/>
-- 
cgit v1.2.3


From fbff0b9ef2ffc2fe85dcae123cc75be2c0cf0ce8 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Jun 2012 12:14:19 +0530
Subject: [IMP]project: Set record rule for public or followers

bzr revid: dbr@tinyerp.com-20120604064419-3scxoolmyj8iskw3
---
 addons/project/security/project_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 2bfe967e675..0d9cd75227b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -36,6 +36,13 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule" id="project_public_members_rule">
+        <field name="name">public Members</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('privacy_visility','in',[False,'public']),('members','in',[user.id])]</field>
+    </record>
+
     <record model="ir.rule" id="task_comp_rule">
         <field name="name" >Task multi-company</field>
         <field name="model_id" ref="model_project_task"/>
-- 
cgit v1.2.3


From 6de57c1fbfcef6cf30208bd879918549775da106 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 14:15:43 +0530
Subject: [IMP]remove name search and add search on account_analytic_id

bzr revid: sgo@tinyerp.com-20120604084543-fty7cqq3isr0fakq
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index dc80897f8c8..19275fa073c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1272,7 +1272,7 @@ class account_analytic_account(osv.osv):
     def project_create(self,cr,uid,analytic_account_id,vals,context=None):
         res = {}
         project_pool = self.pool.get('project.project')
-        project_id = project_pool.name_search(cr, uid, name=vals.get('name'))
+        project_id = project_pool.search(cr, uid, [('analytic_account_id','=',analytic_account_id)])
         if not project_id:
             res['name'] = vals.get('name')
             res['analytic_account_id'] = analytic_account_id
-- 
cgit v1.2.3


From be2bee253f69dc0609436e127f11eb7f86746720 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Mon, 4 Jun 2012 14:28:59 +0530
Subject: [IMP]project: set attrs on team tab

bzr revid: dbr@tinyerp.com-20120604085859-j4ocx0qkrimwpf7c
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6710e455cb6..7cc57ba3ad9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -86,7 +86,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page name="team" string="Team">
+                        <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
                             <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
-- 
cgit v1.2.3


From e7f5c1088bbdcaee6a48fe534ec7501ff858c3d5 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 4 Jun 2012 16:03:42 +0530
Subject: [IMP]type invible when type is contract and template and project
 related issues solved

bzr revid: sgo@tinyerp.com-20120604103342-g0pnstp5cexttdb7
---
 addons/project/project.py       | 2 +-
 addons/project/project_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 19275fa073c..2e86c79bddc 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1272,7 +1272,7 @@ class account_analytic_account(osv.osv):
     def project_create(self,cr,uid,analytic_account_id,vals,context=None):
         res = {}
         project_pool = self.pool.get('project.project')
-        project_id = project_pool.search(cr, uid, [('analytic_account_id','=',analytic_account_id)])
+        project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
         if not project_id:
             res['name'] = vals.get('name')
             res['analytic_account_id'] = analytic_account_id
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6710e455cb6..ad7474b7d40 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -625,7 +625,7 @@
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1"/>
+                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From f5c7e060b888be686e94f6badac003d698337812 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 4 Jun 2012 16:21:29 +0530
Subject: [IMP]:improved view code

bzr revid: apa@tinyerp.com-20120604105129-zlbaoej3qj4kdpbo
---
 addons/project/project_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9559481fa49..8d34084d9b9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -633,8 +633,10 @@
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
                 <xpath expr='//separator[@name="description"]' position='before'>
-                    <separator colspan="4" string="Team"/>
-                    <field name="members" colspan="4" nolabel="1" attrs="{'invisible': [('use_tasks','!=',1)]}"/>
+                    <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
+                        <separator colspan="4" string="Team"/>
+                        <field name="members" colspan="4" nolabel="1"/>
+                    </group>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From 6aa0ca7a7e2f03edcd614cfa48831f67f83d58d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 14:22:21 +0200
Subject: [IMP] mail_thread: cleaned message_get_subscribers and related
 methods; propagated change so that project_issue, mrp, crm_lead, project,
 project_task, hr_recruitment and hr_holidays now cleanly override
 message_get_subscribers.

bzr revid: tde@openerp.com-20120605122221-nvxfxfcx5o82vkvx
---
 addons/project/project.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index e7af9f49b7d..1760e8d6aa3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -475,11 +475,12 @@ def Project():
         return result
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+        """ Override to add responsible user. """
+        user_ids = super(project, self).message_get_subscribers(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+            if obj.user_id and not obj.user_id.id in user_ids:
+                user_ids.append(obj.user_id.id)
+        return user_ids
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project, self).create(cr, uid, vals, context=context)
@@ -1152,13 +1153,14 @@ class task(base_stage, osv.osv):
         return result
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
-        sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
+        """ Override to add responsible user and project manager. """
+        user_ids = super(project_task, self).message_get_subscribers(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
-            if obj.user_id:
-                sub_ids.append(obj.user_id.id)
-            if obj.manager_id:
-                sub_ids.append(obj.manager_id.id)
-        return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+            if obj.user_id and not obj.user_id.id in user_ids:
+                user_ids.append(obj.user_id.id)
+            if obj.manager_id and not obj.manager_id.id in user_ids:
+                user_ids.append(obj.manager_id.id)
+        return user_ids
 
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
-- 
cgit v1.2.3


From e407e7380c3a6c65e6be9d26cacfa9f7ce1181a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 5 Jun 2012 14:54:01 +0200
Subject: [FIX] Still fixing wrong class names in super.

bzr revid: tde@openerp.com-20120605125401-1v8c4wytp9jw6ryg
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 1760e8d6aa3..804b725e6fa 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1154,7 +1154,7 @@ class task(base_stage, osv.osv):
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
         """ Override to add responsible user and project manager. """
-        user_ids = super(project_task, self).message_get_subscribers(cr, uid, ids, context=context)
+        user_ids = super(task, self).message_get_subscribers(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.user_id and not obj.user_id.id in user_ids:
                 user_ids.append(obj.user_id.id)
-- 
cgit v1.2.3


From 3511620380243eb62d16c35209dbe77a2df92de4 Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Wed, 6 Jun 2012 17:25:26 +0200
Subject: [IMP] after having the portal module tested on the runbot with a
 db_all, adjust some of the rights and add several 'groups' attributes

bzr revid: abo@openerp.com-20120606152526-zkfskd3xa2cdb22c
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c8883906fb0..374bb357ff5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -348,7 +348,7 @@
                             </group>
                             <group col="3" colspan="2">
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2" groups="project.group_time_work_estimation_tasks"/>
-                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
+                                <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit" groups="project.group_time_work_estimation_tasks"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}"/>
-- 
cgit v1.2.3


From 0125e320c98705ec412daf0d154ca84466262687 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 6 Jun 2012 17:36:29 +0200
Subject: [IMP] analytic: misc imp related to project and contract mangement
 task

bzr revid: qdp-launchpad@openerp.com-20120606153629-jlk1k0ze09b7pu6s
---
 addons/project/project.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 95c4e6b7813..25997b1a91e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -190,8 +190,8 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
-        #'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
-        #    help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+            help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
@@ -1247,8 +1247,6 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
-        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
-            states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
     }
 #    _defaults = {
 #        'use_tasks': True,
-- 
cgit v1.2.3


From 1918bb0a069617d0cd8470bdd5d98e6ba363ab7d Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 11:15:29 +0530
Subject: [IMP]project: Set privacy_visibility instead of privacy_visility.

bzr revid: dbr@tinyerp.com-20120607054529-n7sigtg2a5y6zg1i
---
 addons/project/project.py       | 4 ++--
 addons/project/project_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 25997b1a91e..cd274f1cc5c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,7 +78,7 @@ class project(osv.osv):
                members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
            else:
                members = project_id.members or False
-           select = vals.get('privacy_visility') or project_id.privacy_visility or False
+           select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
            if select=='follower' and members:
                member_list = [member.id for member in members]
                followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
@@ -220,7 +220,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_visility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visility', select=True),
+        'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
      }
     
     def dummy(self, cr, uid, ids, context):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e6c160dac8f..7f8f34df2ce 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -46,7 +46,7 @@
                             <field name="user_id" string="Project Manager" select="1" 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="privacy_visility"/>
+                            <field name="privacy_visibility"/>
                             <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
                             <!--<field name="progress_rate" widget="progressbar"/>-->
-- 
cgit v1.2.3


From a36b500424f923ee2638b237b79002a1db141a76 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 7 Jun 2012 11:28:47 +0530
Subject: [IMP]:analytic,project:the validity and project sections are on the
 same line.

bzr revid: apa@tinyerp.com-20120607055847-12hq1p2fnalr0xs8
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e6c160dac8f..613461e0440 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -627,12 +627,12 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
-                <xpath expr='//separator[@name="description"]' position='before'>
+<!--                <xpath expr='//separator[@name="description"]' position='before'>
                     <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
                         <separator colspan="4" string="Team"/>
                         <field name="members" colspan="4" nolabel="1"/>
                     </group>
-                </xpath>
+                </xpath>-->
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>
-- 
cgit v1.2.3


From 2ce7c4e329e1b1aea9bd117c7798898a18369c4b Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 7 Jun 2012 13:02:25 +0530
Subject: [FIX]project: members field remove from .py but not from .xml so now
 remove

bzr revid: dbr@tinyerp.com-20120607073225-hdvwrcd8avtdxx0g
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f8f34df2ce..d91c412b11c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -630,7 +630,7 @@
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group colspan="4" attrs="{'invisible': [('use_tasks','!=',1)]}" name="members">
                         <separator colspan="4" string="Team"/>
-                        <field name="members" colspan="4" nolabel="1"/>
+                        <!--<field name="members" colspan="4" nolabel="1"/>-->
                     </group>
                 </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
-- 
cgit v1.2.3


From 0a377b68c8a93eada4e94ffadb9259c7e15572ba Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 7 Jun 2012 16:01:54 +0530
Subject: [IMP]improve general apply button red color in configuration wizard

bzr revid: pja@tinyerp.com-20120607103154-db1r7fzlz82prgb8
---
 addons/project/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff26e88..6d00f8e750c 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" layout="manual">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_hi"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-- 
cgit v1.2.3


From 06c234a6c1589f84f452a287f1699918296554fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 7 Jun 2012 17:25:36 +0200
Subject: [REM] project_oissue, crm_meeting, project, hr_recruitment: removed
 get_needaction_user_ids definition, as the default behavior of mail.thread is
 sufficient.

bzr revid: tde@openerp.com-20120607152536-h9vwg2t4ser8f3v2
---
 addons/project/project.py | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 804b725e6fa..d5ffdd4f5d6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -465,14 +465,6 @@ def Project():
     # ------------------------------------------------
     # OpenChatter methods and notifications
     # ------------------------------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = dict.fromkeys(ids)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = []
-            if obj.state == 'draft' and obj.user_id:
-                result[obj.id] = [obj.user_id.id]
-        return result
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
         """ Override to add responsible user. """
-- 
cgit v1.2.3


From d8d752f3099b82704699bec4ea07a97ee0b01589 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Fri, 8 Jun 2012 11:53:18 +0530
Subject: [rearrange] Rearrange fields

bzr revid: shp@tinyerp.com-20120608062318-jmle3thwuumllh97
---
 addons/project/res_config.py       |  1 +
 addons/project/res_config_view.xml | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 21281110fb9..3c396d76b3a 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -46,6 +46,7 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff26e88..1a52936d055 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,28 +7,33 @@
             <field name="type">form</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
+           
                 <form string="Configure Project" layout="manual">
                     <header>
                         <button string="Apply" type="object" name="execute"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
+                  
                     <sheet layout="auto">
+                      <group> 
                         <separator string="Project" colspan="4"/>
+                        <field name="group_time_work_estimation_tasks"/>
+                        <field name="group_tasks_work_on_tasks"/>
+                        <field name="time_unit"/> 
                         <field name="module_project_mrp"/>
                         <field name="module_project_timesheet"/>
                         <field name="module_pad"/>
-                        <field name="group_tasks_work_on_tasks"/>
-                        <field name="group_time_work_estimation_tasks"/>
-
                         <separator string="Planning" colspan="4"/>
                         <field name="module_project_long_term"/>
-
                         <separator string="Helpdesk and Support" colspan="4"/>
                         <field name="module_project_issue"/>
                         <field name="module_project_issue_sheet"/>
                         <group name="support" colspan="4"/>
+                       </group> 
                     </sheet>
+                   
                 </form>
+              
             </field>
         </record>
 
-- 
cgit v1.2.3


From d30d000ae3a74b73ecacb337291db616812a2f6c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 12:50:54 +0530
Subject: [IMP]:added icons on buttons.

bzr revid: apa@tinyerp.com-20120608072054-lrcr5jhnpg9jgyil
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 35a976f2169..e521654e5a7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -56,12 +56,12 @@
                                 <tr name="use_tasks_row">
                                     <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-stock_align_left_24" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
                                     <th/>
                                     <td/>
-                                    <td style="text-align:right;" width="110px"><button class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                    <td style="text-align:right;" width="110px"><button icon="gtk-dnd-multiple" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
                                 </tr>
                             </table>
                         </group>
-- 
cgit v1.2.3


From 547f036aa3e5eb40c211128990df39f04d3ffb61 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 8 Jun 2012 14:35:37 +0530
Subject: [IMP]:project:overwrit state field to display 'pending' in project
 and 'To Renew' in contract.

bzr revid: apa@tinyerp.com-20120608090537-mtftf3jqc6d286y8
---
 addons/project/project.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index cd274f1cc5c..07229e35b76 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -221,6 +221,7 @@ class project(osv.osv):
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
         'privacy_visibility': fields.selection([('public','Public'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
+        'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
      }
     
     def dummy(self, cr, uid, ids, context):
@@ -241,6 +242,7 @@ class project(osv.osv):
     _order = "sequence"
     _defaults = {
         'active': True,
+        'state': 'open',
         'priority': 1,
         'sequence': 10,
         'type_ids': _get_type_common,
-- 
cgit v1.2.3


From ce10cdd7a6f061a57d2dedfa54dd01047af7c62f Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Mon, 11 Jun 2012 15:49:28 +0530
Subject: [ADD] added functionality of working time unit in project
 configuration

bzr revid: bde@tinyerp.com-20120611101928-p8w3q360y5w04liy
---
 addons/project/res_config.py       | 25 ++++++++++++++++++++++++-
 addons/project/res_config_view.xml |  2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 3c396d76b3a..67ce3ef5b44 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import osv, fields
+from tools.translate import _
 
 class project_configuration(osv.osv_memory):
     _name = 'project.config.settings'
@@ -46,7 +47,7 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
-        'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
@@ -57,5 +58,27 @@ class project_configuration(osv.osv_memory):
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),                                
     }
+    
+    def default_get(self, cr, uid, fields, context=None):
+        res = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        res['time_unit'] = user.company_id.project_time_mode_id.id
+        return res
+    
+    def _get_default_time_unit(self, cr, uid, context=None):
+        product_uom_obj = self.pool.get('product.uom')
+        ids = product_uom_obj.search(cr, uid, [('name', '=', _('Hour'))], context=context)
+        return ids and ids[0] or False
+
+    _defaults = {
+        'time_unit': _get_default_time_unit,
+    }
+    
+    def set_project_defaults(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids)[0]
+        if wizard.time_unit:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
+        return {}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 1a52936d055..5ac38dc71a9 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -19,7 +19,7 @@
                         <separator string="Project" colspan="4"/>
                         <field name="group_time_work_estimation_tasks"/>
                         <field name="group_tasks_work_on_tasks"/>
-                        <field name="time_unit"/> 
+                        <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/> 
                         <field name="module_project_mrp"/>
                         <field name="module_project_timesheet"/>
                         <field name="module_pad"/>
-- 
cgit v1.2.3


From dbf72709e866ea562be10c68ef189342ac5574b1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 16:41:17 +0530
Subject: [FIX]:in project, there is twice a configuration / stages menuitem:
 one for claim stages and another for task stages. Both should be under the
 same menuitem

bzr revid: apa@tinyerp.com-20120612111117-xm1ikdpvcp8rzno6
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 36d49382f7f..25d1158be68 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -10,7 +10,7 @@
             web_icon_hover="images/project-hover.png"/>
 
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
-        <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
         
         <act_window
             context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
@@ -768,11 +768,11 @@
             <field name="help">Define the steps that will be used in the project from the creation of the 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.</field>
         </record>
 
-        <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Stages" parent="project.menu_definitions" sequence="1"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
+        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
-- 
cgit v1.2.3


From 7fe92bdcdcc52579b567d407cabae26cdaa56840 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 17:00:27 +0530
Subject: [IMP]:improved css

bzr revid: apa@tinyerp.com-20120612113027-w422svxcj0mxf6bu
---
 addons/project/static/src/css/project.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 7d589675a4a..6718f8c92b3 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,5 +1,5 @@
 .oe_btn_width {
-    width: 100px;
+    width: 110px;
 }
 .oe_kanban_project {
     width: 300px;
-- 
cgit v1.2.3


From 38b84e8411d9f877cacd3a1e97a180906c5d22ef Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 12 Jun 2012 17:04:46 +0530
Subject: [IMP]:project:improved project view and removed commented code.

bzr revid: apa@tinyerp.com-20120612113446-7vn1yfbg81vusc97
---
 addons/project/project_view.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 25d1158be68..962b858094c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -47,9 +47,6 @@
                             <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="privacy_visibility"/>
-                            <!--<field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
-                            <!--<field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>-->
-                            <!--<field name="progress_rate" widget="progressbar"/>-->
                         </group>
                         <group col="2" colspan="2" class="oe_form_group_label_border">
                             <table border="0">
@@ -67,7 +64,7 @@
                         </group>
                     </group>
                     <notebook colspan="4">
-                        <page string="Members">
+                        <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
                             <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
@@ -102,16 +99,7 @@
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
-                        <page name="team" string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}">
-                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
-                                <tree string="Members">
-                                    <field name="name"/>
-                                    <field name="user_email"/>
-                                </tree>
-                            </field>
-                        </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <!--<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>-->
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
-- 
cgit v1.2.3


From b2a5ab368d64559375a861de6270f0d9ef3e5667 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 13 Jun 2012 12:07:31 +0200
Subject: [IMP] account_analytic_analysis: code improved for automation of
 project creation

bzr revid: qdp-launchpad@openerp.com-20120613100731-9so4m41fz7yrtb5w
---
 addons/project/project.py | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 038c260d84e..f7ccf0fdeb8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1248,19 +1248,26 @@ class account_analytic_account(osv.osv):
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
-#    _defaults = {
-#        'use_tasks': True,
-#    }
-    
-    def project_create(self,cr,uid,analytic_account_id,vals,context=None):
-        res = {}
+
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        '''
+        This function is used to decide if a project needs to be automatically created or not when an analytic account is created. It returns True if it needs to be so, False otherwise.
+        '''
+        return vals.get('use_tasks')
+
+    def project_create(self, cr, uid, analytic_account_id, vals, context=None):
+        '''
+        This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
+        '''
         project_pool = self.pool.get('project.project')
         project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
-        if not project_id:
-            res['name'] = vals.get('name')
-            res['analytic_account_id'] = analytic_account_id
-            project_pool.create(cr, uid, res, context=context)
-        return True
+        if not project_id and self._trigger_project_creation(vals):
+            project_values = {
+                'name': vals.get('name'),
+                'analytic_account_id': analytic_account_id,
+            }
+            return project_pool.create(cr, uid, project_values, context=context)
+        return False
 
     def create(self, cr, uid, vals, context=None):
         if context is None:
@@ -1268,8 +1275,7 @@ class account_analytic_account(osv.osv):
         if vals.get('child_ids', False) and context.get('analytic_project_copy', False):
             vals['child_ids'] = []
         analytic_account_id = super(account_analytic_account, self).create(cr, uid, vals, context=context)
-        if vals.get('use_tasks', False):
-            self.project_create(cr, uid, analytic_account_id, vals, context)
+        self.project_create(cr, uid, analytic_account_id, vals, context=context)
         return analytic_account_id
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
-- 
cgit v1.2.3


From 618aacc5a707c1c7ad952f1e4ba10f14d8274a85 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 13 Jun 2012 18:45:07 +0530
Subject: [IMP]:passed base menus ref instead of project.

bzr revid: apa@tinyerp.com-20120613131507-1yezuu5k7dc1h9s3
---
 addons/project/security/project_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index aebfeb04df8..ba2d07ef93a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -14,7 +14,7 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="ir.ui.menu" id="menu_definitions">
+    <record model="ir.ui.menu" id="base.menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
 
-- 
cgit v1.2.3


From a9e1ede2774dd01d272bf1bb8248114697df2281 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Thu, 14 Jun 2012 13:01:54 +0530
Subject: [IMP]:Project:Added Active and return flow

bzr revid: tch@tinyerp.com-20120614073154-fhpy06yyex5x0h8a
---
 addons/project/project_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fb875b9dc60..a65db02d0d6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,12 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -326,15 +327,15 @@
                 <form string="Project" version="7.0">
                     <header>
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending"/>
+                                states="draft,pending" class="oe_form_button_active_flow"/>
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}"/>
+                                states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open"/>
+                                states="open" class="oe_form_button_active_flow"/>
                         <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending"/>
+                                states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
+                                states="cancel,done" class="oe_form_button_return_flow"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
-- 
cgit v1.2.3


From dc1edf44be5593f9048f442a8aec68ae5250d953 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 14 Jun 2012 12:09:22 +0200
Subject: [IMP] project: implemented the privacy/visibility record rule in a
 cleaner way + some cleanup and bug fixing related to contract management

bzr revid: qdp-launchpad@openerp.com-20120614100922-5g29ui88nhqojon2
---
 addons/project/project.py                    | 48 ++++++++++++----------------
 addons/project/security/project_security.xml |  2 +-
 2 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index f7ccf0fdeb8..d68e5ab589d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -70,23 +70,6 @@ class project(osv.osv):
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
-        for project_id in self.browse(cr, uid, ids, context):
-           if vals.get('members'):
-               members = self.pool.get('res.users').browse(cr, uid, vals.get('members')[0][-1], context)
-           else:
-               members = project_id.members or False
-           select = vals.get('privacy_visibility') or project_id.privacy_visibility or False
-           if select=='follower' and members:
-               member_list = [member.id for member in members]
-               followers = self.message_get_subscribers_ids(cr, uid, ids, context=context)
-               for member_id in member_list:
-                   if not member_id in followers:
-                      self.message_subscribe(cr, uid, ids, [member_id], context=context)
-        return super(project, self).write(cr, uid, ids, vals, context=context)
-
     def _complete_name(self, cr, uid, ids, name, args, context=None):
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
@@ -182,6 +165,23 @@ class project(osv.osv):
             res[task.project_id.id] += 1
         return res
 
+    def _get_followers(self, cr, uid, ids, name, arg, context=None):
+        '''
+        Functional field that computes the users that are 'following' a thread.
+        '''
+        res = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            l = set()
+            for message in project.message_ids:
+                l.add(message.user_id and message.user_id.id or False)
+            res[project.id] = list(filter(None, l))
+        return res
+
+    def _search_followers(self, cr, uid, obj, name, args, context=None):
+        project_obj = self.pool.get('project.project')
+        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
+        return [('id', 'in', project_ids)]
+
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
@@ -220,21 +220,15 @@ 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'), ('follower','Followers Only')], 'Privacy / Visibility', select=True),
+        'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'),
         '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'),
      }
     
     def dummy(self, cr, uid, ids, context):
         return True
 
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        followers = super(project,self).message_thread_followers(cr, uid, ids, context=context)
-        for project in self.browse(cr, uid, followers.keys(), context=context):
-            project_followers = set(followers[project.id])
-            project_followers.add(project.user_id.user_email)
-            followers[project.id] = filter(None, project_followers)
-        return followers
-
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -1261,7 +1255,7 @@ class account_analytic_account(osv.osv):
         '''
         project_pool = self.pool.get('project.project')
         project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
-        if not project_id and self._trigger_project_creation(vals):
+        if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
             project_values = {
                 'name': vals.get('name'),
                 'analytic_account_id': analytic_account_id,
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index ba2d07ef93a..829ec6c6971 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -45,7 +45,7 @@
         <field name="name">public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('privacy_visility','in',[False,'public']),('members','in',[user.id])]</field>
+        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
-- 
cgit v1.2.3


From 5563434379183934877b7b9e45babc4af19d4132 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Thu, 14 Jun 2012 18:25:59 +0530
Subject: [IMP] correct the spelling taks to task for Manage Task Delegation.

bzr revid: nco@tinyerp.com-20120614125559-4e8hdy1eoq3lap03
---
 addons/project/res_config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 486f2cd746c..d2281b99ab9 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -58,7 +58,7 @@ class project_configuration(osv.osv_memory):
         'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("Manage Taks Delegation",
+        'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
             implied_group='project.group_delegate_task',
             help="Allows you to delegate tasks to other users."),                                
     }
-- 
cgit v1.2.3


From 3f4b3eac1ee86495cc6354d66ca33eaa79ef7c38 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Thu, 14 Jun 2012 18:31:47 +0530
Subject: [IMP] project: improved color of button based on business flow

bzr revid: tpa@tinyerp.com-20120614130147-mf89jyc3lqote1br
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a65db02d0d6..e25fdc4f969 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -23,7 +23,7 @@
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_active_flow"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
@@ -331,7 +331,7 @@
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_form_button_return_flow"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,open,pending" class="oe_form_button_active_flow"/>
                         <button name="do_draft" string="Draft" type="object"
-- 
cgit v1.2.3


From 66c3093feef8df9c21f34fa1aea402087dd3c7ea Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 10:12:54 +0200
Subject: [IMP] contract management: misc improvements

bzr revid: qdp-launchpad@openerp.com-20120615081254-rhh9nwmz3bqn7e9d
---
 addons/project/project.py       | 1 +
 addons/project/project_view.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index d68e5ab589d..812542cf768 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -236,6 +236,7 @@ class project(osv.osv):
     _order = "sequence"
     _defaults = {
         'active': True,
+        'type': 'contract',
         'state': 'open',
         'priority': 1,
         'sequence': 10,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f30ba027040..542ae3d085b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -53,12 +53,12 @@
                                 <tr name="use_tasks_row">
                                     <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
                                     <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-stock_align_left_24" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
                                 </tr>
                                 <tr name="use_attachment_row">
                                     <th/>
                                     <td/>
-                                    <td style="text-align:right;" width="110px"><button icon="gtk-dnd-multiple" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
                                 </tr>
                             </table>
                         </group>
@@ -636,9 +636,9 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project" name="project_sep"/>
+                    <separator colspan="2" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
                 </xpath>
-            	<xpath expr='//group[@name="project"]' position='inside'>
+                <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_tasks" />
                 </xpath>
             </field>
-- 
cgit v1.2.3


From bde7606b5b531526bde11e0124975f1836aec0b0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 14:59:18 +0200
Subject: [REM] project: removal of warn_manager and warn_customer features
 that are now handled by the chatter

bzr revid: qdp-launchpad@openerp.com-20120615125918-zaiickzw4yuudqkj
---
 addons/project/project.py                     | 25 +---------
 addons/project/project_demo.xml               |  2 -
 addons/project/project_view.xml               | 16 +-----
 addons/project/static/src/css/project.css     |  3 --
 addons/project/wizard/__init__.py             |  1 -
 addons/project/wizard/mail_compose_message.py | 72 ---------------------------
 6 files changed, 4 insertions(+), 115 deletions(-)
 delete mode 100644 addons/project/wizard/mail_compose_message.py

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 812542cf768..fa27595196c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -188,8 +188,6 @@ class project(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
-        'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
@@ -214,9 +212,6 @@ class project(osv.osv):
                 'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
-        'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'warn_header': fields.text('Mail Header', help="Header 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)]}),
-        '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)]}),
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
         'color': fields.integer('Color Index'),
@@ -914,28 +909,12 @@ class task(base_stage, osv.osv):
         return True
 
     def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task, then opens the wizard to send an 
-            email to the partner or the project manager.
+        """ This action closes the task 
         """
         task_id = len(ids) and ids[0] or False
         self._check_child_task(cr, uid, ids, context=context)
         if not task_id: return False
-        task = self.browse(cr, uid, task_id, context=context)
-        project = task.project_id
-        res = self.do_close(cr, uid, [task_id], context=context)
-        if project.warn_manager or project.warn_customer:
-            return {
-                'name': _('Send Email after close task'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'nodestroy': True,
-                'context': {'active_id': task.id,
-                            'active_model': 'project.task'}
-           }
-        return res
+        return self.do_close(cr, uid, [task_id], context=context)
 
     def do_close(self, cr, uid, ids, context=None):
         """ Compatibility when changing to case_close. """
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f685f14c85b..07951280dc7 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -286,14 +286,12 @@
         
 
         <record id="project_project_9" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="name">OpenERP Integration</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge')])]" name="type_ids"/>
         </record>
         <record id="project_project_21" model="project.project">
-            <field name="warn_manager">1</field>
             <field name="priority">10</field>
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Study + Prototype</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 542ae3d085b..41bcef24f4f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -84,31 +84,19 @@
                             </field>
                         </page>
                         <page string="Administration">
-                            <group col="2" colspan="2">
-                                <separator colspan="4" string="Performance"/>
+                            <group string="Administration">
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
                                 <field name="resource_calendar_id"/>
                             </group>
-                            <newline/>
-                            <group col="2" colspan="2" name="misc">
-                                <separator colspan="4" string="Miscellaneous"/>
+                            <group string="Miscellaneous" name="misc">
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="warn_manager"/>
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <newline/>
-                            <group colspan="4" col="4">
-                                <separator colspan="2" string="Mail Header"/>
-                                <separator colspan="2" string="Mail Footer"/>
-                                <field name="warn_header" nolabel="1" colspan="2"/>
-                                <field name="warn_footer" nolabel="1" colspan="2"/>
-                            </group>
                             <group col="3">
                                 <b>
                                     <label string="Variables you can use for headers and footer." colspan="3"/>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 6718f8c92b3..ebab44e225a 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,6 +1,3 @@
-.oe_btn_width {
-    width: 110px;
-}
 .oe_kanban_project {
     width: 300px;
 }
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index f5324d2b6aa..7a9a734b2bd 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import mail_compose_message
 import project_task_delegate
 import project_task_reevaluate
 
diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
deleted file mode 100644
index 1609cc04c1c..00000000000
--- a/addons/project/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-from tools.translate import _
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'project.task' and resource_id:
-            task_pool = self.pool.get('project.task')
-            task_data = task_pool.browse(cr, uid, resource_id, context=context)
-            partner = task_data.partner_id or task_data.project_id.partner_id
-            if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
-                raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
-            elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)):
-                raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
-
-            result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
-            val = {
-                    'name': task_data.name,
-                    'user_id': task_data.user_id.name,
-                    'task_id': "%d/%d" % (task_data.project_id.id, task_data.id),
-                    'date_start': task_data.date_start,
-                    'date': task_data.date_end,
-                    'state': task_data.state
-            }
-            header = (task_data.project_id.warn_header or '') % val
-            footer = (task_data.project_id.warn_footer or '') % val
-            description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
-            if partner :
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email})
-            result.update({
-                       'body_text': description or False,
-                       'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,
-                       'subject':  _("Task '%s' Closed") % task_data.name,
-                       'model': model,
-                       'res_id': resource_id,
-                    })
-
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 41f2eba9fb2b1b8ca7bd90cee1f8c35ac237112c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 15:10:56 +0200
Subject: [IMP] contract management: misc code cleaning and improvements

bzr revid: qdp-launchpad@openerp.com-20120615131056-swbbcy7obbbjjo33
---
 addons/project/project_view.xml | 54 ++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 41bcef24f4f..28a5b35c2f5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,34 +38,33 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" layout="auto">
-                    <group col="4" colspan="4">
-                        <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <field name="name" string="Project Name" select="1"/>
+                <sheet string="Project">
+                    <group>
+                        <label for="name" class="oe_form_readonly_hidden"/>
+                        <h1>
+                            <field name="name" string="Project Name"/>
+                        </h1>
+                        <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                            <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="privacy_visibility"/>
                         </group>
-                        <group col="2" colspan="2" class="oe_form_group_label_border">
-                            <table border="0">
-                                <tr name="use_tasks_row">
-                                    <th style="border-right:1px solid #DDD;" width="140px">Tasks Management</th>
-                                    <td><field name="use_tasks" nolabel="1"/></td>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <th/>
-                                    <td/>
-                                    <td style="text-align:right;" width="110px"><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
-                                </tr>
-                            </table>
+                        <group col="4">
+                            <group>
+                                <label string=""/>
+                                <field name="use_tasks"/>
+                            </group>
+                            <group>
+                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/>
+                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                            </group>
                         </group>
                     </group>
-                    <notebook colspan="4">
+                    <notebook>
                         <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
-                            <field colspan="4" name="members" nolabel="1" widget="many2many_kanban">
+                            <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
                                     <templates>
@@ -94,19 +93,8 @@
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
-                        </page>
-                        <page string="Billing" groups="account.group_account_invoice">
-                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
-                            <group col="3">
-                                <b>
-                                    <label string="Variables you can use for headers and footer." colspan="3"/>
-                                </b>
-                                <label string="Task: %%(name)s"/>
-                                <label string="User: %%(user_id)s"/>
-                                <label string="ID: %%(task_id)s"/>
-                                <label string="Status: %%(state)s"/>
-                                <label string="Date Start: %%(date_start)s"/>
-                                <label string="Date Stop: %%(date)s"/>
+                            <group string="Billing" groups="account.group_account_invoice">
+                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             </group>
                         </page>
                         <page string="Tasks Stages">
-- 
cgit v1.2.3


From 00ae9a7f18e29de51399ee02d8d335187fb981e3 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Fri, 15 Jun 2012 18:57:53 +0530
Subject: [FIX]: Remove default_get() method from project config file.

bzr revid: atp@tinyerp.com-20120615132753-l8k2xcir8u119zue
---
 addons/project/res_config.py | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index d2281b99ab9..ff8d108741d 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -63,11 +63,6 @@ class project_configuration(osv.osv_memory):
             help="Allows you to delegate tasks to other users."),                                
     }
     
-    def default_get(self, cr, uid, fields, context=None):
-        res = {}
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        res['time_unit'] = user.company_id.project_time_mode_id.id
-        return res
     
     def _get_default_time_unit(self, cr, uid, context=None):
         product_uom_obj = self.pool.get('product.uom')
-- 
cgit v1.2.3


From efdbaf40888dbbd8dd1fe1fae06130ccd25de28a Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:48:35 +0200
Subject: [IMP] project: version 7.0 for the project form view

bzr revid: qdp-launchpad@openerp.com-20120615144835-189jbt84u2z3si8u
---
 addons/project/project_view.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 28a5b35c2f5..40402799616 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -39,11 +39,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project">
+                    <label for="name" class="oe_form_readonly_hidden"/>
+                    <h1>
+                        <field name="name" string="Project Name"/>
+                    </h1>
                     <group>
-                        <label for="name" class="oe_form_readonly_hidden"/>
-                        <h1>
-                            <field name="name" string="Project Name"/>
-                        </h1>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -51,19 +51,21 @@
                             <field name="parent_id" invisible="1" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                             <field name="privacy_visibility"/>
                         </group>
-                        <group col="4">
-                            <group>
-                                <label string=""/>
-                                <field name="use_tasks"/>
-                            </group>
-                            <group>
-                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/>
-                                <button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
-                            </group>
+                        <group>
+                            <table>
+                                <tr name="use_tasks_row">
+                                    <td><group><field name="use_tasks"/></group></td>
+                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
+                                </tr>
+                                <tr name="use_attachment_row">
+                                    <td/>
+                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action" /></td>
+                                </tr>
+                            </table>
                         </group>
                     </group>
                     <notebook>
-                        <page string="Team" attrs="{'invisible':[('use_tasks','=', 0)]}" name="team">
+                        <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
                                 <kanban quick_create="true" create="false">
                                     <field name="name"/>
-- 
cgit v1.2.3


From d23a4ad38d5ff08303177a6e8c9a9bd0f97fa51b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 16:52:20 +0200
Subject: [IMP] project: usabiltiy improvement

bzr revid: qdp-launchpad@openerp.com-20120615145220-a08228oqpf7thb5m
---
 addons/project/project_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 40402799616..d94c5b588a3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -84,7 +84,7 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page string="Administration">
+                        <page string="Other Info">
                             <group string="Administration">
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
@@ -94,8 +94,6 @@
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                            </group>
-                            <group string="Billing" groups="account.group_account_invoice">
                                 <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             </group>
                         </page>
-- 
cgit v1.2.3


From ff519229291957074cc7875a8eb96c8822dbe9c1 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:19:19 +0200
Subject: [IMP] usability imp

bzr revid: qdp-launchpad@openerp.com-20120615151919-a1yisdlk672ehqft
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d94c5b588a3..30f0db38497 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -612,7 +612,7 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="2" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
+                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
                 </xpath>
                 <xpath expr='//separator[@name="project_sep"]' position='after'>
                     <field name="use_tasks" />
-- 
cgit v1.2.3


From 9a6036f38d9494c5c82656b49c537ffb5be6f4f2 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Fri, 15 Jun 2012 17:25:44 +0200
Subject: [FIX+IMP]  project_timesheet:fixed bad reference; project= usabilty
 improvements

bzr revid: qdp-launchpad@openerp.com-20120615152544-yy9zdx3pxeyol4bc
---
 addons/project/project_view.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 30f0db38497..86a744a87ba 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -85,16 +85,18 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <group string="Administration">
-                                <field name="planned_hours" widget="float_time"/>
-                                <field name="effective_hours" widget="float_time" />
-                                <field name="resource_calendar_id"/>
-                            </group>
-                            <group string="Miscellaneous" name="misc">
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
-                                <field name="priority"/>
-                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                            <group>
+                                <group string="Administration">
+                                    <field name="planned_hours" widget="float_time"/>
+                                    <field name="effective_hours" widget="float_time" />
+                                    <field name="resource_calendar_id"/>
+                                </group>
+                                <group string="Miscellaneous" name="misc">
+                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="priority"/>
+                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Tasks Stages">
-- 
cgit v1.2.3


From 4311eaa121ac053f145ec41298717a6651d6631f Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Mon, 18 Jun 2012 14:42:36 +0530
Subject: [REM] : Remove cancel button from wizard

bzr revid: aja@tinyerp.com-20120618091236-3e8vhdb4thokf72i
---
 addons/project/res_config_view.xml                     | 3 +--
 addons/project/wizard/project_task_delegate_view.xml   | 3 +--
 addons/project/wizard/project_task_reevaluate_view.xml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 9d1e19a7c81..ea032228b3d 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
                     </header>
                     <sheet>
                         <group col="4">
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9ed920eb534..79b13c9e258 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_form_button_active_flow"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 4a452bca3ab..80e2847b508 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_form_button_active_flow"/>
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
-- 
cgit v1.2.3


From 0624eddfc34cd6e5314c63bb560cf813a8761895 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 18 Jun 2012 15:56:13 +0530
Subject: [FIX]: Fix typo for warehouse and set default company time unit.

bzr revid: atp@tinyerp.com-20120618102613-5gd35uk0bbwvptn3
---
 addons/project/res_config.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index ff8d108741d..035ef600c4f 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -65,14 +65,15 @@ class project_configuration(osv.osv_memory):
     
     
     def _get_default_time_unit(self, cr, uid, context=None):
+        res = {}
         product_uom_obj = self.pool.get('product.uom')
-        ids = product_uom_obj.search(cr, uid, [('name', '=', _('Hour'))], context=context)
-        return ids and ids[0] or False
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        res['time_unit'] = user.company_id.project_time_mode_id.id
+        return res.get('time_unit', False)
 
     _defaults = {
         'time_unit': _get_default_time_unit,
     }
-    
     def set_project_defaults(self, cr, uid, ids, context=None):
         wizard = self.browse(cr, uid, ids)[0]
         if wizard.time_unit:
-- 
cgit v1.2.3


From c0f54153c7250356f785b1c25e42396ca24a0a76 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 18 Jun 2012 13:56:34 +0200
Subject: [FIX] project, hr_timesheet_invoice, project_timesheet: fixed flow to
 invoice on timesheets + some code cleaning

bzr revid: qdp-launchpad@openerp.com-20120618115634-eos7eq6gdvxqoyn6
---
 addons/project/project.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index fa27595196c..a6626aae5d1 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1234,7 +1234,7 @@ class account_analytic_account(osv.osv):
         This function is called at the time of analytic account creation and is used to create a project automatically linked to it if the conditions are meet.
         '''
         project_pool = self.pool.get('project.project')
-        project_id = project_pool.search(cr, uid, [('name','=',vals.get('name'))])
+        project_id = project_pool.search(cr, uid, [('analytic_account_id','=', analytic_account_id)])
         if not project_id and self._trigger_project_creation(cr, uid, vals, context=context):
             project_values = {
                 'name': vals.get('name'),
@@ -1252,6 +1252,14 @@ class account_analytic_account(osv.osv):
         self.project_create(cr, uid, analytic_account_id, vals, context=context)
         return analytic_account_id
 
+    def write(self, cr, uid, ids, vals, context=None):
+        name = vals.get('name')
+        for account in self.browse(cr, uid, ids, context=context):
+            if not name:
+                vals['name'] = account.name
+            self.project_create(cr, uid, account.id, vals, context=context)
+        return super(account_analytic_account, self).write(cr, uid, ids, vals, context=context)
+
     def unlink(self, cr, uid, ids, *args, **kwargs):
         project_obj = self.pool.get('project.project')
         analytic_ids = project_obj.search(cr, uid, [('analytic_account_id','in',ids)])
-- 
cgit v1.2.3


From 23fc5392e6613eea565f4006bd0b6643b19ccfd8 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Tue, 19 Jun 2012 19:02:23 +0530
Subject: [FIX] : Fix css class color on button issue

bzr revid: aja@tinyerp.com-20120619133223-mmu2hn9oa4utzwqx
---
 addons/project/project_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index dea62b4d690..7458276fd8c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -333,9 +333,13 @@
                                 states="cancel,done" class="oe_form_button_return_flow"/>
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done,cancelled" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                                states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
+                                states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_form_button_active_flow"/>
+                        <button name="action_close" string="Done" type="object"
+                                states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
                                 states="open" class="oe_form_button_return_flow"/>
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-- 
cgit v1.2.3


From e80980330b63f1c25ab7a582164975c4402bff09 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 20 Jun 2012 15:42:05 +0530
Subject: [USA] replaced red button class oe_form_button_active_flow to
 oe_highlight

bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
---
 addons/project/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7458276fd8c..f68a901d4dd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_form_button_active_flow"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_form_button_active_flow"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
                     <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_form_button_active_flow"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_form_button_active_flow"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
@@ -328,16 +328,16 @@
                     <header>
                         <!--
                         <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_form_button_active_flow"/>
+                                states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
                                 states="cancel,done" class="oe_form_button_return_flow"/>
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                states="done" context="{'button_reactivate':True}" class="oe_form_button_active_flow"/>
+                                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}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open" class="oe_form_button_active_flow"/>
+                                states="open" class="oe_highlight"/>
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
-- 
cgit v1.2.3


From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 16:19:23 +0530
Subject: [IMP]Added highlight button on wizard

bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
---
 addons/project/res_config_view.xml                     | 2 +-
 addons/project/wizard/project_task_delegate_view.xml   | 2 +-
 addons/project/wizard/project_task_reevaluate_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index d6c60cee277..3f658457fb5 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_form_button_active_flow"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                     </header>
                     <group col="4">
                         <separator string="Project" colspan="4"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 79b13c9e258..67500a0b7ed 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 80e2847b508..9504296e941 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
-- 
cgit v1.2.3


From 501721883d488f6a6981bdb49ac112943d32001f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 21 Jun 2012 12:39:59 +0530
Subject: [USB] removed useless class defination

bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b1be15caf88..320be4fcb2d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -22,8 +22,8 @@
                 <header>
                     <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" class="oe_form_button_return_flow"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" class="oe_form_button_return_flow"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
+                    <button name="set_pending" string="Pending" type="object" states="open" />
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@@ -332,7 +332,7 @@
                         <button name="do_open" string="Start Task" type="object"
                                 states="draft,pending" class="oe_highlight"/>
                         <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done" class="oe_form_button_return_flow"/>
+                                states="cancel,done" />
                         -->
                         <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="done" context="{'button_reactivate':True}" class="oe_highlight"/>
@@ -343,7 +343,7 @@
                         <button name="action_close" string="Done" type="object"
                                 states="draft,pending" />        
                         <button name="do_pending" string="Pending" type="object"
-                                states="open" class="oe_form_button_return_flow"/>
+                                states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                 states="pending,open,draft" groups="project.group_delegate_task"/>
                         <button name="do_cancel" string="Cancel" type="object"
-- 
cgit v1.2.3


From 7fab61fceb0c649d895347a31483320da6a15d79 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 22 Jun 2012 12:24:39 +0200
Subject: [FIX] project: fix project settings form view

bzr revid: rco@openerp.com-20120622102439-gs9t0848n811w37p
---
 addons/project/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 5fd54f7862d..a90ee821454 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -18,11 +18,11 @@
                                 <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>
                         </group>
                         <group string="Planning">
-- 
cgit v1.2.3


From 0a48c466554b587fea8ab4cd1c77a871fe7fdb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 22 Jun 2012 12:56:46 +0200
Subject: [IMP] project_issue, project, event, hr_holidays: added Inbox filter.

bzr revid: tde@openerp.com-20120622105646-hmsxe62xcul2mxeq
---
 addons/project/project_view.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7588de7348f..ab2f4335949 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -133,6 +133,11 @@
             <field name="arch" type="xml">
                 <search string="Search Project">
                    <group>
+                        <filter icon="terp-mail-message-new"
+                            string="Inbox" help="Unread messages"
+                            name="needaction_pending"
+                            domain="[('needaction_pending','=',True)]"/>
+                        <separator orientation="vertical"/>
                        <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                        <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
                        <filter icon="gtk-media-pause" string="Template"
@@ -446,6 +451,8 @@
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
+                    <field name="message_summary"/>
+                    <field name="needaction_pending"/>
                     <templates>
                         <t t-name="task_details">
                             <ul class="oe_kanban_tooltip" t-if="record.project_id.raw_value">
@@ -591,6 +598,11 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <group>
+                        <filter icon="terp-mail-message-new"
+                            string="Inbox" help="Unread messages"
+                            name="needaction_pending"
+                            domain="[('needaction_pending','=',True)]"/>
+                        <separator orientation="vertical"/>
                         <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                         <filter name="open" 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"/>
-- 
cgit v1.2.3


From 451b05e68d4fe96ca0d7bfbf850ce0528df925fa Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 25 Jun 2012 11:20:39 +0530
Subject: [FIX] Task done button CSS Imp

bzr revid: jam@tinyerp.com-20120625055039-05bo1r5c0x6lqsbb
---
 addons/project/project_view.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b077a7bd725..499fc1938b2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -337,9 +337,7 @@
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open" class="oe_highlight"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,pending" />        
+                                states="open,draft,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"
-- 
cgit v1.2.3


From fdc196343fea5f14eed500c93999bddb009871ba Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 25 Jun 2012 12:02:33 +0530
Subject: [IMP]improve code and add tooltip on task_management

bzr revid: sgo@tinyerp.com-20120625063233-9w7pf3eg16ok4kyj
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index a6626aae5d1..ab02cc870bb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1219,7 +1219,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Management'),
+        '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"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
-- 
cgit v1.2.3


From ef87129d694e56ccd6bb874482769bf845dfd532 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 10:43:13 +0200
Subject: [IMP] project: simplify code and improve res.company inherited view

bzr revid: rco@openerp.com-20120625084313-atvbr3hc8940whtt
---
 addons/project/project_view.xml |  6 +++---
 addons/project/res_config.py    | 27 +++++++++------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f883f007bd6..84c65777e95 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -750,9 +750,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <page string="Configuration" position="inside">
-                    <separator string="Project Management" colspan="4"/>
-                    <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
-                    <newline/>
+                    <group string="Project Management">
+                        <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
+                    </group>
                 </page>
             </field>
         </record>
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 035ef600c4f..b112506e073 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -47,7 +47,7 @@ class project_configuration(osv.osv_memory):
         'module_project_issue': fields.boolean("Issues and Bug Tracking",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
-        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True, 
+        'time_unit': fields.many2one('product.uom', 'Working Time Unit', required=True,
             help="""This will set the unit of measure used in projects and tasks."""),
         'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
             help="""Provides timesheet support for the issues/bugs management in project.
@@ -60,25 +60,16 @@ class project_configuration(osv.osv_memory):
             help="Allows you to compute Time Estimation on tasks."),
         'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
             implied_group='project.group_delegate_task',
-            help="Allows you to delegate tasks to other users."),                                
+            help="Allows you to delegate tasks to other users."),
     }
-    
-    
-    def _get_default_time_unit(self, cr, uid, context=None):
-        res = {}
-        product_uom_obj = self.pool.get('product.uom')
+
+    def get_default_time_unit(self, cr, uid, fields, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        res['time_unit'] = user.company_id.project_time_mode_id.id
-        return res.get('time_unit', False)
+        return {'time_unit': user.company_id.project_time_mode_id.id}
 
-    _defaults = {
-        'time_unit': _get_default_time_unit,
-    }
-    def set_project_defaults(self, cr, uid, ids, context=None):
-        wizard = self.browse(cr, uid, ids)[0]
-        if wizard.time_unit:
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
-        return {}
+    def set_time_unit(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user.company_id.write({'project_time_mode_id': config.time_unit.id})
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3


From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 25 Jun 2012 15:39:01 +0530
Subject: [IMP]Improve wizard button

bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
---
 addons/project/res_config_view.xml                     | 2 +-
 addons/project/wizard/project_task_delegate_view.xml   | 2 +-
 addons/project/wizard/project_task_reevaluate_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 3f658457fb5..136911a50f1 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_editable" />
                     </header>
                     <group col="4">
                         <separator string="Project" colspan="4"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 67500a0b7ed..9a6ae405768 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_editable" />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 9504296e941..7f15a7905bd 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_editable" />
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
-- 
cgit v1.2.3


From 91be67f77458d8d17d10a932b5e848e0b5a45ae3 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Mon, 25 Jun 2012 18:06:35 +0530
Subject: [USA] remove red button class oe_highlight in module  project and
 contract for done and close button

bzr revid: rma@tinyerp.com-20120625123635-28qyp2scvwrd148d
---
 addons/project/project_view.xml                      | 4 ++--
 addons/project/wizard/project_task_delegate_view.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 499fc1938b2..e45216685ff 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,7 +20,7 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" class="oe_highlight"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending" />
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
                     <button name="set_pending" string="Pending" type="object" states="open" />
@@ -337,7 +337,7 @@
                          <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
                                 states="cancelled" context="{'button_reactivate':True}"/>
                         <button name="action_close" string="Done" type="object"
-                                states="open,draft,pending" class="oe_highlight"/>
+                                states="open,draft,pending" />
                         <button name="do_pending" string="Pending" type="object"
                                 states="open" />
                         <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 67500a0b7ed..8c80e9ae98a 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"  />
                     </header>
                     <group>
                         <group>
-- 
cgit v1.2.3


From d9db3c44df2a183d5f9d9f34ba6f6e8d597e135f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 25 Jun 2012 19:12:53 +0530
Subject: [REN] renamed e-mail, E-mail, E-Mail to email, Email

bzr revid: jam@tinyerp.com-20120625134253-sebauihl53zctcu0
---
 addons/project/i18n/project.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 19c18efd5d1..46cf1a9279a 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -663,7 +663,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
-- 
cgit v1.2.3


From 12ae053fba1389f3352c4ae7de9f2f797417c246 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 15:55:04 +0200
Subject: [IMP] in all config wizards, add class 'oe_highlight_on_dirty' on
 button 'Apply'

bzr revid: rco@openerp.com-20120625135504-0f03j2j6p7d1pp7l
---
 addons/project/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index a90ee821454..b1daeb66b22 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Tue, 26 Jun 2012 12:01:19 +0530
Subject: [IMP]Apply css class flow on wizards buttons

bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
---
 addons/project/wizard/project_task_delegate_view.xml   | 2 +-
 addons/project/wizard/project_task_reevaluate_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 9a6ae405768..69d6b2c495e 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 7f15a7905bd..39e3427ff3b 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_editable" />
+                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
-- 
cgit v1.2.3


From 0806d443e823af7dbc90405ba7446dc2f4f7f2b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:49:46 +0200
Subject: [IMP] config wizards: add an action on button 'Cancel' to get the
 expected behavior

bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
---
 addons/project/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index b1daeb66b22..28258c483ce 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group string="Project">
-- 
cgit v1.2.3


From 6c879adbaebe0817cc1fac6edef699aa96539a0e Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 26 Jun 2012 17:27:00 +0530
Subject: [IMP] kanban project.task

bzr revid: tta@openerp.com-20120626115700-2ssby2yt15oaodmx
---
 addons/project/project.py       |   2 +-
 addons/project/project_view.xml | 128 +++++++++++++++++++---------------------
 2 files changed, 62 insertions(+), 68 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 429672d3269..79523dcc23e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -753,7 +753,7 @@ class task(base_stage, osv.osv):
 
     _order = "priority, sequence, date_start, name, id"
 
-    def set_priority(self, cr, uid, ids, priority):
+    def set_priority(self, cr, uid, ids, priority, *args):
         """Set task priority
         """
         return self.write(cr, uid, ids, {'priority' : priority})
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index be4421f126b..a3308f5e4cd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -445,76 +445,70 @@
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
-                    <templates>
-                        <t t-name="task_details">
-                            <ul class="oe_kanban_tooltip" t-if="record.project_id.raw_value">
-                                <li><b>Project:</b> <field name="project_id"/></li>
-                            </ul>
-                        </t>
-                        <t t-name="kanban-box">
-                            <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
-                            <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
-                            <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                    <tr>
-                                        <td align="left" valign="middle" width="16">
-                                            <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                        </td>
-                                        <td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
-                                            <field name="name"/>
-                                        </td>
-                                        <td valign="top" width="22">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
-                                            width="22" height="22" class="oe_kanban_gravatar"/>
-                                        </td>
-                                    </tr>
-                                    </table>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <div class="oe_kanban_description">
-                                            <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
-                                            <i t-if="record.date_deadline.raw_value">
-                                                <t t-if="record.description.raw_value">, </t>
-                                                <field name="date_deadline"/>
-                                            </i>
-                                            <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
-                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
-                                                <t t-set="times" t-value="[
-                                                     [1, (hours gte 1 and hours lt 2)]
-                                                    ,[2, (hours gte 2 and hours lt 5)]
-                                                    ,[5, (hours gte 5 and hours lt 10)]
-                                                    ,[10, (hours gte 10)]
-                                                ]"/>
-                                                <t t-foreach="times" t-as="time"
-                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
-                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
-                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
-                                                ></t>
-                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
-                                            </span>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                            <a name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                                            <a name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                                        </div>
-                                        <div class="oe_kanban_right">
-                                            <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
-                                            <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
-                                            <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
+                    <templates>                    
+                    <t t-name="kanban-box">
+                        <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.str.underscored(_.str.trim(record.name.raw_value))"/></t>
+                        <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t>
+                        <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <span class="oe_e">i</span>
+                                <ul class="oe_dropdown_menu">
+                                    <li><a type="edit" >Edit...</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                    <li><a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object">Mark as Blocked</a></li>
+                                    <li><a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object">Normal</a></li>
+                                    <li><a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object">Done</a></li>
+                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>                                    
+                                </ul>
+                            </div>
+                            <div class="oe_kanban_content">
+                                <div>
+                                    <b><field name="name"/></b>                                     
+                                </div>
+                                <div>
+                                    <field name="partner_id"/>                   
+                                </div>                                 
+                                <div>
+                                    <field name="project_id"/>
+                                </div> 
+                                <div class="oe_kanban_footer_left">
+                                    <div class="oe_right">
+                                    <span class="oe_kanban_highlight">
+                                            <t t-set="priority" t-value="record.priority.raw_value || 5"/>
+                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Medium Priority">
+                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['2']" t-if="priority lte 3" title="Medium Priority">
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['1']" title="High Priority"> 
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 1 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                            <a type="object" name="set_priority" args="['0']" title="Highest Priority">
+                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 0 ? 'on' : 'off'}.png" width="16" height="16"/>
+                                            </a>
+                                         </span>
+                                    <!--
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
+                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
+                                    -->
+                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                 </div>
                             </div>
-                        </t>
-                    </templates>
+                            <div class="oe_clear"></div>
+                        </div>
+                        <!--
+                            <div class="oe_kanban_right">
+                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
+                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
+                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
+                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
+                            </div>
+                        -->
+                    </t>
+                </templates>
                 </kanban>
             </field>
          </record>
-- 
cgit v1.2.3


From 10f024ecb66d7b0c3d24105b39efc20376381d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 26 Jun 2012 14:00:13 +0200
Subject: [IMP] crm_meeting, crm_phonecall, sale, project, hr_holidays, event,
 purchase: added server actions for (un)read.

bzr revid: tde@openerp.com-20120626120013-zhcea1fdyaltogq1
---
 addons/project/project_view.xml | 75 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bee3236dbd3..6cebd16d867 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -12,6 +12,43 @@
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
+        <!-- Project Read/Unread actions -->
+        <record id="actions_server_project_unread" model="ir.actions.server">
+            <field name="name">Mark unread</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_unread" model="ir.values">
+            <field name="name">action_project_unread</field>
+            <field name="action_id" ref="actions_server_project_unread"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_unread'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_project" />
+            <field name="model">project.project</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
+        <record id="actions_server_project_read" model="ir.actions.server">
+            <field name="name">Mark read</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_project"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_read" model="ir.values">
+            <field name="name">action_project_read</field>
+            <field name="action_id" ref="actions_server_project_read"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_read'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_project" />
+            <field name="model">project.project</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -322,6 +359,44 @@
         </record>
 
         <!-- Task -->
+
+        <!-- Task Read/Unread actions -->
+        <record id="actions_server_project_task_unread" model="ir.actions.server">
+            <field name="name">Mark unread</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_task_unread" model="ir.values">
+            <field name="name">action_project_task_unread</field>
+            <field name="action_id" ref="actions_server_project_task_unread"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_unread'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_task" />
+            <field name="model">project.task</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
+        <record id="actions_server_project_task_read" model="ir.actions.server">
+            <field name="name">Mark read</field>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="model_project_task"/>
+            <field name="state">code</field>
+            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        </record>
+        <record id="action_project_task_read" model="ir.values">
+            <field name="name">action_project_task_read</field>
+            <field name="action_id" ref="actions_server_project_task_read"/>
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_project_task_read'))" />
+            <field name="key">action</field>
+            <field name="model_id" ref="model_project_task" />
+            <field name="model">project.task</field>
+            <field name="key2">client_action_multi</field>
+        </record>
+
         <record id="view_task_form2" model="ir.ui.view">
             <field name="name">project.task.form</field>
             <field name="model">project.task</field>
-- 
cgit v1.2.3


From 788748604fcbb9eda51cb61bf400072d58272fd3 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 27 Jun 2012 16:06:10 +0530
Subject: [IMP] kanban : project.task, project.issue, hr.applicant

bzr revid: tta@openerp.com-20120627103610-1uwuz2geen0psq5j
---
 addons/project/project_view.xml | 53 ++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a3308f5e4cd..5ece80fc646 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -455,15 +455,15 @@
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
                                     <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object">Mark as Blocked</a></li>
-                                    <li><a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object">Normal</a></li>
-                                    <li><a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object">Done</a></li>
+                                    <li><a type="delete">Delete</a></li>                                   
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>                                    
                                 </ul>
                             </div>
                             <div class="oe_kanban_content">
                                 <div>
+                                    
+                                    <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
                                     <b><field name="name"/></b>                                     
                                 </div>
                                 <div>
@@ -471,29 +471,32 @@
                                 </div>                                 
                                 <div>
                                     <field name="project_id"/>
+                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
+                                    <i><field name="date_deadline"/></i>
+                                    <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
+                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
+                                                <t t-set="times" t-value="[
+                                                     [1, (hours gte 1 and hours lt 2)]
+                                                    ,[2, (hours gte 2 and hours lt 5)]
+                                                    ,[5, (hours gte 5 and hours lt 10)]
+                                                    ,[10, (hours gte 10)]
+                                                ]"/>
+                                                <t t-foreach="times" t-as="time"
+                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
+                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
+                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
+                                                ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
+                                    </span>
                                 </div> 
-                                <div class="oe_kanban_footer_left">
+                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
+                                    <div class="oe_left">
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>                                    
+                                    </div>
                                     <div class="oe_right">
-                                    <span class="oe_kanban_highlight">
-                                            <t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                            <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Medium Priority">
-                                               <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['2']" t-if="priority lte 3" title="Medium Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['1']" title="High Priority"> 
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 1 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                            <a type="object" name="set_priority" args="['0']" title="Highest Priority">
-                                               <img t-attf-src="/web/static/src/img/icons/star-#{priority == 0 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                            </a>
-                                         </span>
-                                    <!--
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
-                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
-                                    -->
-                                    <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                    <a name="set_kanban_state_blocked" string="Mark as Blocked" attrs="{'invisible' : [('kanban_state', 'not in', ('normal', 'done'))]}" type="object" icon="kanban-stop"/>
+                                    <a name="set_kanban_state_normal" string="Normal" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'done'))]}" type="object" icon="gtk-media-play"/>
+                                    <a name="set_kanban_state_done" string="Done" attrs="{'invisible' : [('kanban_state', 'not in', ('blocked', 'normal'))]}" type="object" icon="kanban-apply"/>
                                     </div>
                                 </div>
                             </div>
-- 
cgit v1.2.3


From deefa50354a7a3b7d2a305dafa38a0510a35cf3f Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 19:23:23 +0530
Subject: [FIX] project* buton cancel

bzr revid: jam@tinyerp.com-20120627135323-r0v2agpm9rbghoao
---
 addons/project/wizard/project_task_delegate_view.xml   | 4 +++-
 addons/project/wizard/project_task_reevaluate_view.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 69d6b2c495e..0eb37be406d 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight_on_dirty"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group>
                         <group>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 39e3427ff3b..de94e0079b1 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,9 @@
             <field name="arch" type="xml">
                 <form string="Reevaluate Task" version="7.0">
                     <header>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_on_dirty"  />
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight_on_dirty"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <separator string="Reevaluation Task"/>
                     <group>
-- 
cgit v1.2.3


From 077de5e43d1dfd34edac2c633634be2cd9f0544c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Jun 2012 16:25:52 +0200
Subject: [IMP] crm_phonecall: now has default inbox behavior for
 needaction_pending; project_task: updated needaction.

bzr revid: tde@openerp.com-20120627142552-zjkhc79ytlqrsp1i
---
 addons/project/project.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index aadebe04ecd..b93b45f1840 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1135,10 +1135,15 @@ class task(base_stage, osv.osv):
         return 'Task'
 
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = dict.fromkeys(ids, [])
+        """ Returns the user_ids that have to perform an action
+            :return: dict { record_id: [user_ids], }
+        """
+        result = super(project_task, self).get_needaction_user_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'draft' and obj.user_id:
-                result[obj.id] = [obj.user_id.id]
+                result[obj.id].add(obj.user_id.id)
+            elif obj.state == 'draft':
+                result[obj.id].add(uid)
         return result
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
-- 
cgit v1.2.3


From 90094ff19b4d015cc64114467aeaf016ac36650c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 20:20:49 +0530
Subject: [FIX] setting cancel link

bzr revid: jam@tinyerp.com-20120627145049-hu0h8x0ui3d74sz0
---
 addons/project/res_config_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 28258c483ce..f5efa64fa9a 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -9,7 +9,8 @@
                 <form string="Configure Project" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <sheet>
                         <group string="Project">
-- 
cgit v1.2.3


From 997fe404b317ca0e963cf5a59c38bc6f524702b0 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 28 Jun 2012 04:41:01 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120628044101-cehvpv9yfm3xfsr3
---
 addons/project/i18n/ar.po    | 458 ++++++++++++++++++-------
 addons/project/i18n/bg.po    |   6 +-
 addons/project/i18n/bs.po    |   6 +-
 addons/project/i18n/ca.po    |   6 +-
 addons/project/i18n/cs.po    |   6 +-
 addons/project/i18n/da.po    |   6 +-
 addons/project/i18n/de.po    |  11 +-
 addons/project/i18n/el.po    |   6 +-
 addons/project/i18n/es.po    |  11 +-
 addons/project/i18n/es_AR.po |   6 +-
 addons/project/i18n/es_CR.po |  13 +-
 addons/project/i18n/es_EC.po | 178 +++++-----
 addons/project/i18n/es_PY.po |   6 +-
 addons/project/i18n/et.po    |   6 +-
 addons/project/i18n/eu.po    |   6 +-
 addons/project/i18n/fi.po    | 160 +++++----
 addons/project/i18n/fr.po    | 218 ++++++------
 addons/project/i18n/gl.po    |   6 +-
 addons/project/i18n/gu.po    |   6 +-
 addons/project/i18n/hr.po    |   6 +-
 addons/project/i18n/hu.po    |   6 +-
 addons/project/i18n/id.po    |   6 +-
 addons/project/i18n/it.po    |   8 +-
 addons/project/i18n/ja.po    |  11 +-
 addons/project/i18n/ko.po    |   6 +-
 addons/project/i18n/lt.po    | 394 +++++++++++++++-------
 addons/project/i18n/lv.po    |  16 +-
 addons/project/i18n/mn.po    | 306 ++++++++++-------
 addons/project/i18n/nb.po    |   6 +-
 addons/project/i18n/nl.po    | 182 +++++-----
 addons/project/i18n/nl_BE.po | 784 ++++++++++++++++++++++++++++++-------------
 addons/project/i18n/pl.po    | 171 +++++-----
 addons/project/i18n/pt.po    | 659 ++++++++++++++++++++++++------------
 addons/project/i18n/pt_BR.po |  21 +-
 addons/project/i18n/ro.po    | 521 ++++++++++++++--------------
 addons/project/i18n/ru.po    | 224 ++++++++-----
 addons/project/i18n/sk.po    |   6 +-
 addons/project/i18n/sl.po    |   6 +-
 addons/project/i18n/sq.po    |   6 +-
 addons/project/i18n/sv.po    | 511 ++++++++++++++++------------
 addons/project/i18n/tlh.po   |   6 +-
 addons/project/i18n/tr.po    |   6 +-
 addons/project/i18n/uk.po    |   6 +-
 addons/project/i18n/vi.po    |   6 +-
 addons/project/i18n/zh_CN.po |  13 +-
 addons/project/i18n/zh_TW.po |   6 +-
 46 files changed, 3131 insertions(+), 1889 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index 0555682c337..49da04245c7 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,13 +24,13 @@ msgstr ""
 #. 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 "إعادة تضمين وصف المهمة في مهمة المستخدم"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "تم تفويض المهمة ‘%s لـ %s."
 
 #. module: project
 #: constraint:res.users:0
@@ -56,18 +56,18 @@ msgstr "أخبر شريك"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "ضع هنا الساعات المتبقية المطلوبة لغلق المهمة."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "المواعيد النهائية"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "غير مسموح بالعملية !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -76,7 +76,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "تحقق: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -98,12 +98,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "تأخير المهمة"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "ساعات التحقق من الصلاحية"
 
 #. module: project
 #: view:project.project:0
@@ -126,17 +126,17 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "ويعطي ترتيب التسلسل عند عرض قائمة المشاريع"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "خطأ! يجب ان يكون تاريخ بدء المشروع اقل من تاريخ انتهائه."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,7 +146,7 @@ msgstr "أعضاء المشروع"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "مهمة من قبل المفوض"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -156,7 +156,7 @@ msgstr "مارس"
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "المهام المفوضة"
 
 #. module: project
 #: field:project.task,child_ids:0
@@ -174,12 +174,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr ""
+msgstr "المهام الخاصة بي"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "خطأ ! لا يمكنك انشاء مهام متداخلة."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
@@ -195,7 +195,7 @@ msgstr ""
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "عنوان المهمة الخاصة بك"
 
 #. module: project
 #: field:project.task.type,name:0
@@ -205,7 +205,7 @@ msgstr "اسم المرحلة"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "ضبط معلق"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -215,22 +215,22 @@ msgstr ""
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "حدد المتطلبات والساعات المخططة الموضوعة."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "مرحلة التغيير"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "المشروع الجديد بناءا على القالب"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "خطأ! لا يمكنك تعيين التصعيد لنفس المشروع!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -241,12 +241,12 @@ msgstr "عاجل جداً"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "المسنخدم الذي تريد تفويض هذه المهمة اليه"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "المهمة الخاصة بي"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
@@ -262,12 +262,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "اضبطه كقالب"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "مهمة السحب"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -286,7 +286,7 @@ msgstr "الأعضاء"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "فتح المهامات الخاصة بي"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -303,7 +303,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "عمل مهمة المشروع"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -313,13 +313,13 @@ msgstr "ملاحظات"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "المشروع مقابل الساعات المتبقية"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "متوسط كفاءة الخطة"
 
 #. module: project
 #: help:project.task,active:0
@@ -328,32 +328,35 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"تم حساب هذا الحلق تلقائيًا وله نفس السلوك عن منطقية الحقل ‘الفعال‘: اذا تم "
+"ربط المهمة للقالب اوللمشروع الغير مفعل, سيتم اخفائها الا اذا طلبت على وجه "
+"التحديد."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "ملخص المهمة"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "ليست قالب المهمة"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr ""
+msgstr "ابدء المهمة"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "تم اكتمال المهمة"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
-msgstr ""
+msgstr "المتغيرات التلقائية للرؤوس والتذييل. استخدم نفس التدوين بالضبط."
 
 #. module: project
 #: view:project.task:0
@@ -386,7 +389,7 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "تم تأدية المهمة"
 
 #. module: project
 #: field:project.task,color:0
@@ -406,7 +409,7 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "ويفوض المهام لمستخدم اخر"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
@@ -424,6 +427,8 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"اذا قمت التحقق من هذا, سينبثق المستخدم عند غلق المهمة اقتراح ارسال رسالة الى "
+"العميل."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -434,7 +439,7 @@ msgstr "الإختبار"
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "تم غلق المهمة ‘%s‘"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -450,7 +455,7 @@ msgstr "محسوب باستخدام مجموع مهام الأعمال المن
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "التخطيط"
 
 #. module: project
 #: view:project.task:0 field:project.task,date_deadline:0
@@ -492,7 +497,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# من المهام"
 
 #. module: project
 #: view:project.task:0
@@ -502,12 +507,12 @@ msgstr "السابق"
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "عُينت لـ"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "تاريخ التوقف: %(التاريخ)"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -517,7 +522,7 @@ msgstr "لا يمكن ان يكون هناك مستخدمان بنفس اسم ا
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "إعادة كمشروع"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
@@ -542,12 +547,12 @@ msgstr "التالي"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "من حالة السحب, ستصبح لحالة الفتح."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# من الايام"
 
 #. module: project
 #: view:project.project:0
@@ -574,12 +579,12 @@ msgstr "نسبة المهام المغلقة وفقاً لمجموع المها
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "وصف مهمة جديدة"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "مهمة المشروع"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -604,17 +609,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "فاعلية الساعات"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "التحقق من صحة عنوان العمل"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "اعادة تقييم"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -625,7 +630,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "تأخير العبور"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -648,7 +653,7 @@ msgstr "الساعات المتبقية"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -682,7 +687,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "لا يوجد مهام معينة للمستخدمين"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -690,6 +695,7 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"مجموع الساعات المخططة لكل المهام المتعلقة بهذا المشروع ومشاريعها المتفرعة."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -705,13 +711,13 @@ msgstr "معلّق"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "العنوان الذي تم تأخيره"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr ""
+msgstr "المشاريع الخاصة بي"
 
 #. module: project
 #: view:project.task:0
@@ -757,12 +763,14 @@ 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 ""
+"حدد الخطوات التي ستستخدم في المشروع من انشاء المهمة, صعودا الى غلق المهمة او "
+"المسالة. ستسخدم هذه المراحل بالترتيب لتعقب الاجراء في حل المهمة او المسألة."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "تم فتح المهمة ‘%s‘."
 
 #. module: project
 #: view:project.task:0
@@ -772,7 +780,7 @@ msgstr "تواريخ"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "عنوان جديد للمهمة المؤجلة للمستخدم"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -785,12 +793,12 @@ msgstr ""
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "المشروع مقابل الساعات المتوقعة والكلية"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "مهمة فتتح السحب"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -812,13 +820,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "تحليل المهام"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "المندوب"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -843,12 +851,12 @@ msgstr "مشروع"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_تقييم"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "لجنتي"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -870,7 +878,7 @@ msgstr "إدارة المشاريع"
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "وحدة الزمن للمشروع"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -881,7 +889,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "تأخير مهمة المشروع"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -916,6 +924,13 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"تمثل المهمة العمل الذي يتعين القيام به. كل مستخدم يعمل في قائمة خاصة به من "
+"مهام، حيث يمكن أن تسجل عمله مهمة في ساعات. انه يمكن العمل وإغلاق المهمة "
+"نفسها أو تفويض ذلك إلى مستخدم آخر. إذا قمت بتفويض المهمة لمستخدم آخر، ستحصل "
+"على مهمة جديدة في حالة معلقة، والتي سيتم فتحه عندما يكون لديك لمراجعة العمل "
+"المنجز. إذا قمت بتثبيت وحدة سجل الدوام_للمشروع، يمكن عمل فاتورة لعمل المهمة "
+"بناء على ضبط المشروع. مع وحدة project_mrp، يمكن أن ينشا اوامر البيع  المهام "
+"تلقائيا عندما يتم تأكيدها."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -941,11 +956,15 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"اذا تم انشاء المهمة ستكونالحالة ‘مشروع‘.\n"
+"اذا بدأت المهمة, ستصبح الحالة ‘في التقدم‘.\n"
+"اذا احتاجت المراجعة الى المهمة ستكون الحالة ‘معلق‘.\n"
+"اذا كانت المهمة زائدة, ستعيين الحالات الى ‘تم‘."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -956,13 +975,13 @@ msgstr "شهر"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "مرحلة المهمة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -985,7 +1004,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "الحالات: %(الحالة)"
 
 #. module: project
 #: help:project.task,sequence:0
@@ -1007,7 +1026,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "المهام الاساسية"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1041,7 +1060,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "المستخدم: %(هوية_المستخدم)"
 
 #. module: project
 #: view:project.project:0
@@ -1062,7 +1081,7 @@ msgstr "أولوية"
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "قوالب المشاريع"
 
 #. module: project
 #: view:project.project:0
@@ -1072,7 +1091,7 @@ msgstr "الإدارة"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "اعادة تقييم.المهمة.المشروع"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -1088,12 +1107,12 @@ msgstr "عضو"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "الوقت المقدر لغلق هذه المهمة بواسطة المستخدم المفوض"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1126,6 +1145,9 @@ 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 ""
+"يسمح لك هذا التقرير بتحليل اداء المشاريع الخاصة بك والمستخدمين. يمكنك تحليل "
+"كميات المهام, الساعات المقضية مقارنة بالساعات المخطط اليها, عدد الايام "
+"المتوسط لفتح او غلق المهمة, هكذا."
 
 #. module: project
 #: view:project.task:0
@@ -1138,6 +1160,7 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"اعضاء المشروع هم مستخدمين يمكنهم الوصول للمهمة المتعلقة بهذا المشروع."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1152,7 +1175,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "المهام بالمستخدم والمشروع"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1183,6 +1206,7 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"حالة جديدة لمهمتك الخاصة. وسيرد التعليق تلقائيًا عند غلق المهمة المتأخرة"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1210,12 +1234,12 @@ msgstr "الأيام للغلق"
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "لوحة التحكم للمشروع"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "إعادة تنشيط"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
@@ -1247,7 +1271,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "تم غلق المشروع ‘%s‘."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1257,7 +1281,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "تعديل المهمة"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1292,6 +1316,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"اذا تم تعيين الحقل الفعال الى خطأ, سيسمح لك بإخفاء المشروع بدون ازالتها."
 
 #. module: project
 #: view:project.task:0
@@ -1311,13 +1336,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "ابحث عن المشروع"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "تم فتح المشروع ‘%s‘."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1337,6 +1362,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"ستعين هذه وحدة القياس المستخدمة في المشروعات والمهام.\n"
+"اذا استخدمت سجل الدوام المتصل بالمشاريع(وحدة سجل الدوام_للمشروع), لا تنسى "
+"بضبط الوحدة الصحيحة للقياس في الموظفين الخاصين بك."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1348,17 +1376,17 @@ msgstr "خطأ"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "مشاريع المستخدم"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_التفويض"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "عدد الايام لفتفتح المهمة"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1387,7 +1415,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "عنوان لمهمة التحقق بالصلاحية الخاصة بك"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1405,7 +1433,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "عدد الساعات الكلية"
 
 #. module: project
 #: view:project.task:0 field:project.task,state:0
@@ -1426,12 +1454,12 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "تم تعيين المهمة ‘%s‘ في مرحلة التقدم"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "تاريخ البداية: %(تاريخ_البدء)"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -1440,6 +1468,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"اربط هذا المشروع بالحساب التحليلي اذا كنت تحتاج الى ادارة مالية على "
+"المشاريع. وهي تمكنك بالاتصال بالمشاريع مع الميزانيات, والتخطيط, والتكلفة "
+"وتحليل العائد, سجلات الدوام على المشروع, وهكذا."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1471,7 +1502,7 @@ msgstr "إغلاق"
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "فتح المهمة"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1482,7 +1513,7 @@ msgstr "فتح"
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "هوية: %(هوية_المهمة)"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1514,7 +1545,7 @@ msgstr ""
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1536,17 +1567,17 @@ msgstr ""
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "المهمة ‘%s‘ معلقة."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " المشروع مقابل الساعات"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "المهمة المؤجلة"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1554,6 +1585,7 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"مجموع الساعات المقضية لكل المهم المتعلقة بهذا المشروع ومشاريعها الفرعية."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1579,12 +1611,12 @@ msgstr "تخطي الموعد النهائي"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "المواعيد النهائية للمهمة الخاصة بي"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "إعادة تقييم المهمة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1594,7 +1626,7 @@ msgstr "التّطوير"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "الساعات المتبيقة لي للمشروع"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1615,12 +1647,12 @@ msgstr "مايو"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr ""
+msgstr "التحقق من صلاحية المهمة"
 
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "المهام الكلية"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1634,12 +1666,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "المهام المؤخرة الخاصة بي"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "المهام: %(الاسم)"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1660,7 +1692,7 @@ msgstr "الوقت المستغرق"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "الحسابات الخاصة بي للفاتورة"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -1670,20 +1702,20 @@ msgstr ""
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "مهام المشروع"
 
 #. module: project
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "تمت هذه المهمة ‘%s‘"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "مجموع الساعات الكلية لكل المهام المتعلقة بهذا المشروع وفروعها."
 
 #. module: project
 #: field:project.task.type,project_default:0
@@ -1693,7 +1725,7 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "عند اكتمال المهمة, ستصبح في حالة تم."
 
 #. module: project
 #: view:project.project:0
@@ -1716,7 +1748,7 @@ msgstr "فبراير"
 #: 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 "المهمة بالايام"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1731,12 +1763,12 @@ msgstr "تحرير"
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "تشفير ساعات العمل الخاصة بك"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "ملخص العمل"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1746,7 +1778,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "عدد الايام لغلق المهمة"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1771,7 +1803,7 @@ msgstr "متفرقات"
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "فتح المهمة المكتملة"
 
 #. module: project
 #: view:project.task.type:0
@@ -1781,7 +1813,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "الساعات المقضية"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1793,13 +1825,13 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "ويعطي امر التسلسل عند عرض قائمة للمشاريع."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "تم غلق المهمة ‘%s‘"
 
 #. module: project
 #: field:project.task,id:0
@@ -1820,7 +1852,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "المهام الزائدة"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1842,7 +1874,7 @@ msgstr "مسلسل"
 #: 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 "الساعات المتبقية لكل مشروع"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1850,6 +1882,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"تم اضافة التذييل عند بداية البريد الالكتروني للرساله التحذيرية المرسلة الى "
+"العميل عند غلق المهمة."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1863,22 +1897,29 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"يحتوي المشروع على مجموعة من المهام أو القضايا التي سوف يتم تنفيذها من قبل "
+"الموارد الخاصة بك المسندة إليها. يمكن أن يكون المشروع بتنظيم هرمي، وهو جزء "
+"من المشروع الرئيسي. هذا يسمح لك لتصميم الهياكل للمشروع الكبير مع مختلف مراحل "
+"موزعة على المشروع المشروع خلال الدورة. يمكن لكل مستخدم ضبط مشروعه الافتراضي "
+"في تفضيلاته الخاصة لتصفية تلقائيا المهام أو القضايا التي عادة ما يعمل عليها. "
+"إذا اخترت فاتورة للوقت الذي يقضيه في مهمة المشروع، يمكنك العثور على مهام "
+"المشروع لعمل الفاتورة في قسم الفواتير."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "عمل المهمة"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "التحقق من صلاحية الحالة"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "تم الغاء المهمة ‘%s‘"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1886,6 +1927,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"الوقت المقدر لك للتحقق من صلاحية العمل المكتمل من المستخدم لمن قمت بتفويضه "
+"بهذه المهمة."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1901,7 +1944,7 @@ msgstr "إنشاء تاريخ"
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "تم الغاء المهمة ‘%s‘."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1919,23 +1962,23 @@ msgstr "شريك"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "ارسل بريد الكتروني بعد غلق المهمة"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "مراحل المهام"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "فوض المهمة الخاصة بك الى مستخدم اخر"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "تذييل البريد"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -2015,3 +2058,166 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "الاسم"
+
+#~ msgid "Public Notes"
+#~ msgstr "ملاحظات عامة"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "إنجاز المهام"
+
+#~ msgid "Delegations"
+#~ msgstr "التفويضات"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "تعقب القضايا"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "تعيين المهم"
+
+#~ msgid "Warn Message"
+#~ msgstr "رسالة تحذير"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "المشاريع:المخطط مقابل الساعات الكلية"
+
+#~ msgid "SCRUM"
+#~ msgstr "سكروم"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "يساعد على انتاج الفواتير على أساس الوقت الذي يقضيه في المهام، إذا تفعيلها في "
+#~ "هذا المشروع."
+
+#~ msgid "Project Close Task"
+#~ msgstr "يغلق المشروع المهمة"
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "قم بضبط تطبيق ادارة المشروع الخاص بك"
+
+#~ msgid "Reactivate Project"
+#~ msgstr "إعادة تفعيل المشروع"
+
+#~ msgid "Specification"
+#~ msgstr "تخصيص"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "عنوان البريد الالكتروني للعميل"
+
+#~ msgid "Methodologies"
+#~ msgstr "المنهجيات"
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "الرجاء تحديد عنوان البريد الالكتروني لمدير المشروع."
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "ويساعد المحاسبين في ادارة المزيد من الميزانية والتحليل"
+
+#~ msgid "Parent Project"
+#~ msgstr "المشروع الاساسي"
+
+#~ msgid "Customer Email"
+#~ msgstr "البريد الالكتروني للعميل"
+
+#~ msgid "Task Edition"
+#~ msgstr "تعديل المهمة"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "تحذير المدير عن طريق البريد الالكتروني"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr "غير قادر على ارسال البريد لانه لم يتم ضبط عنوان البريد الالكتروني!"
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr "لا يمكنك حذف المشروع بالمهام. اقترح عليك الغائها."
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "تحذير العميل بالبريد الالكتروني"
+
+#~ msgid "Month works"
+#~ msgstr "اعمال الشهر"
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "الرجاء تخصيص عنوان بريد الكتروني للعميل."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "وتمكنك من تعقب المشاريع الطويلة الاجل, شاملة على مشاريع ذات مراحل متعدده  "
+#~ "وتناول تخصيص المصدر."
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "تم حسابها كإختلاف في التوقيت المقدر من مدير المشروع والوقت الحقيقي لغلق "
+#~ "المهمة."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "الوقت القانوني للمهمة"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "عنوان البريد الالكتروني لمدير المشروع"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "ضبط تطبيق المشروع"
+
+#~ msgid "project.installer"
+#~ msgstr "مُثبت.المشروع"
+
+#~ msgid "Warn Customer"
+#~ msgstr "تحذير العميل"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "المشاريع الخاصة بي: المخططة مقابل الساعات الكلية"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr ""
+#~ "غير قادر على ارسال البريد! تحقق من هويات البريد الالكتروني و اعدادات التكوين "
+#~ "لـsmtp"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "تتزامن تلقائيًا مهام المشروع و حالات ادارة علاقات العملاء."
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "وتُتاح تطبيقات OpenERP المتنوعه لادارة المشاريع الخاصة بك بمستوى مختلف من "
+#~ "التحكم والمرونة."
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr "وتتعقب وتنفذ المفاهيم و علامات المهمة المحددة في منهج سكروم."
+
+#~ 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 هي منهجية لتنظيمك وتنظيم مهامك بكفاءة. وتنتج هذه الوحدة بشكل كامل مبدأ "
+#~ "GTD مع ادارة مشروع OpenERP."
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "تتعقب وحدة ادارة المشروع المشاريع المتعددة المستوى,المهام,العمل المتمم على "
+#~ "المهام, هكدذ. وهي قادرة على تقدير التخطيط, مهام الامر, هكذا.\n"
+#~ "لوحة القيادة لاعضاء المشروع تتضمن:\n"
+#~ "*قائمة من الماه الخاصة بي المفتوحة\n"
+#~ "*قائمة اعضاء المشروع\n"
+#~ "    "
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 63ac1ba73bc..51753d255b6 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "Оставащи часове"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index e717609fc3d..bf6f4db558a 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index fe6931f2711..8a20f0d3fcd 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,7 +662,7 @@ msgstr "Hores restants"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 92c17d9f44a..db09f811f46 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
@@ -655,7 +655,7 @@ msgstr "Zbývající hodiny"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 47229bed142..455c84bff0e 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 19c942300a8..1f9f51077b2 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-02-16 05:04+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,8 +662,8 @@ msgstr "Verbleibende Stunden"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2570,3 +2570,6 @@ msgstr "Aufgaben in Bearbeitung"
 #~ "Error! The currency has to be the same as the currency of the selected "
 #~ "company"
 #~ msgstr "Fehler! Die Währung muss der Währung des Unternehmens entsprechen"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Email-Zusammensetzung Assistent"
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index 948483990e2..2479fda7f84 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -657,7 +657,7 @@ msgstr "Ώρες που Απομένουν"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 303aafd2af6..e61530f7e28 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-02-16 05:04+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -662,8 +662,8 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2565,3 +2565,6 @@ msgstr ""
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index c82036c48f7..f99c47bbd68 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -654,7 +654,7 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index 0cce28f4ee4..2109b8a0b7d 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-17 22:33+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\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: 2012-02-18 04:57+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: \n"
 
 #. module: project
@@ -665,8 +665,8 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Asistente de composición de e-mail"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2579,3 +2579,6 @@ msgstr "Tarea en progreso"
 #~ "company"
 #~ msgstr ""
 #~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index c3781604aa0..f57f2977b16 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -13,39 +13,40 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nuevas tareas"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr "Incluir la descripción de la tarea en la del usuario"
+msgstr "Volver a incluir la descripción de la tarea en la tarea del usuario"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "La tarea '%s' has sido delegada a '%s'."
+msgstr "La tarea '%s' ha sido delegada a %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "LA compañia elegida no esta en las permitidas por el usuario."
+msgstr ""
+"La compañía seleccionada no está autorizada como compañía para este usuario"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mes anterior"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mis tareas"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +81,7 @@ msgstr "COMPROBAR: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email del usuario"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +93,7 @@ msgstr "Trabajo realizado"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡ Advertencia !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +108,7 @@ msgstr "Horas a validar"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Proyectos pendientes"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +122,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Reabrir proyecto"
 
 #. module: project
 #: help:project.project,priority:0
@@ -192,7 +193,7 @@ msgstr "Compañía"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tareas pendientes"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -212,7 +213,7 @@ msgstr "Cambiar a pendiente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -259,7 +260,7 @@ msgstr "Día"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Proyectos y Etapas"
 
 #. module: project
 #: view:project.project:0
@@ -296,11 +297,13 @@ msgstr "Mis tareas abiertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Por favor, especifique el Administrador del proyecto o la dirección de "
+"correo electrónico del Administrador del proyecto."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Para cancelar la tarea"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -365,7 +368,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar únicamente las tareas con fecha límite"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -388,7 +391,7 @@ msgstr "Cabecera correo"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Cambiar a la siguiente etapa"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -398,7 +401,7 @@ msgstr "Tarea realizada"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Color del Indice"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -408,7 +411,7 @@ msgstr "Configuración"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mes actual"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -476,12 +479,12 @@ msgstr "_Cancelar"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Listo"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Cambiar color"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -497,7 +500,7 @@ msgstr " (copia)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nuevas tareas"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -562,18 +565,18 @@ msgstr "# de Días"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Proyectos abiertos"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "¡Usted debe asignar miembros al proyecto '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tareas en proceso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -597,7 +600,7 @@ msgstr "Tarea del proyecto"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nueva"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -608,7 +611,7 @@ msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flujo acumulado"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -630,7 +633,7 @@ msgstr "Reevaluar"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +649,7 @@ msgstr "Media"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tareas pendientes"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -658,19 +661,19 @@ msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tiempo restante"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -738,7 +741,7 @@ msgstr "Julio"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Diagrama de quemado de tareas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -796,6 +799,7 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"No puede eliminar un proyecto que contenga tareas. Le sugerimos desactivarlo."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -820,7 +824,7 @@ msgstr "Retraso horas"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Muy importante"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -841,6 +845,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Si selecciona este campo, el responsable de proyecto recibirá un email cada "
+"vez que una tarea sea completada por su equipo."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -874,7 +880,7 @@ msgstr "Etapas"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Cambiar a etapa anterior"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -890,7 +896,7 @@ msgstr "Unidad de tiempo proyecto"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -917,7 +923,7 @@ msgstr "Padre"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcar como bloqueada"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -995,7 +1001,7 @@ msgstr "Etapa de Tarea"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Diseño"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1008,7 +1014,7 @@ msgstr "Horas estimadas"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Revisar etapas de tareas"
 
 #. module: project
 #: view:project.project:0
@@ -1018,7 +1024,7 @@ msgstr "Estado: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Da el orden de secuencia cuando se muestra una lista de tareas."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1030,7 +1036,7 @@ msgstr "Fecha Inicio"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Listo para extraer"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1043,7 +1049,7 @@ msgstr "Tareas padre"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1051,11 +1057,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Si la tarea tiene un progreso de 99,99% debe cerrar la tarea si está "
+"terminada o reevaluar el tiempo"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Dirección de contacto"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1065,6 +1073,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Las tareas en estado Kanban indican situaciones especiales que le afectan:\n"
+"        * Normal, es la situación por defecto\n"
+"        * Bloqueado, indica que algo está impidiendo el progreso de esta "
+"tarea\n"
+"        * Listo para extraer, indica que la tarea está lista para ser "
+"extraida a la siguiente etapa"
 
 #. module: project
 #: view:project.project:0
@@ -1079,7 +1093,7 @@ msgstr "Facturación"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para cambiar al estado delegar"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1106,7 +1120,7 @@ msgstr "Reevaluar"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CONSULTAR: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1140,7 +1154,7 @@ msgstr "Baja"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Estado Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1162,7 +1176,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Tipo de cambio"
 
 #. module: project
 #: help:project.project,members:0
@@ -1170,6 +1184,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Los miembros del proyecto son usuarios que pueden tener un acceso a las "
+"tareas relacionadas con este proyecto."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1179,7 +1195,7 @@ msgstr "Responsable de proyecto"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Para cambiar ha estado realizado"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1196,7 +1212,7 @@ msgstr "Agosto"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1207,7 +1223,7 @@ msgstr "Nombre del proyecto"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Histórico de tareas"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1222,7 +1238,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor indique el cliente o email del cliente"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1254,7 +1270,7 @@ msgstr "Reactivar"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: project
 #: field:project.project,active:0
@@ -1275,7 +1291,7 @@ msgstr "Noviembre"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Cree sus primeros proyectos"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1286,7 +1302,7 @@ msgstr "El poryecto '%s' ha sido cerrado"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Tareas del flujo acumulado"
 
 #. module: project
 #: view:project.task:0
@@ -1301,7 +1317,7 @@ msgstr "Octubre"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar tiempo planificado y abrir tarea"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1309,11 +1325,13 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculado como la diferencia del tiempo estimado por el responsable del "
+"proyecto y el tiempo real para cerrar la tarea."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico de delegaciones"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1341,7 +1359,7 @@ msgstr "Compañias"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Proyectos en los cuales soy miembro."
 
 #. module: project
 #: view:project.project:0
@@ -1437,7 +1455,7 @@ msgstr "Filtros extendidos..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Por favor, elimine primero el proyecto relacionado con esta cuenta."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1459,7 +1477,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Debe especificar un usuario delegado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1539,7 +1557,7 @@ msgstr "En progreso"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Análisis de tareas"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1548,16 +1566,19 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarea hija sigue abierta.\n"
+"Por favor, cancelar o completar la tarea hija primero."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapas comunes a todos los proyectos"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1573,7 +1594,7 @@ msgstr "Tiempo trabajado"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Proyectos en los cuales soy responsable"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1674,6 +1695,8 @@ msgid ""
 "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."
 msgstr ""
+"Si marca este campo, esta etapa se propondrá de forma predeterminada en cada "
+"nuevo proyecto. No se podrá asignar esta etapa en los proyectos existentes."
 
 #. module: project
 #: view:board.board:0
@@ -1711,7 +1734,7 @@ msgstr "Mis cuentas a facturar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Despliegue"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1736,7 +1759,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Común a todos los proyectos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1769,7 +1792,7 @@ msgstr "Tareas por Día"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: project
 #: view:project.task:0
@@ -1789,7 +1812,7 @@ msgstr "Resumen del trabajo"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mes-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1799,7 +1822,7 @@ msgstr "Número de Dias para cerrar la tarea"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mes-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1824,7 +1847,7 @@ msgstr "Abrir tarea realizada"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comunes"
 
 #. module: project
 #: view:project.task:0
@@ -1837,6 +1860,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Las etapas pueden ser comunes a todos los proyectos o específicos de un "
+"proyecto. Cada tarea seguirá en orden las diferentes etapas para ser cerrada."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1858,12 +1883,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Grafico de Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tareas asignadas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1873,12 +1898,12 @@ msgstr "Tareas sobrepasadas"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Año actual"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1967,7 +1992,7 @@ msgstr "La tarea '%s' esta cancelada"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para cambiar a estado abierto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2001,7 +2026,7 @@ msgstr "Pie correo"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tareas en progreso"
 
 #~ msgid ""
 #~ "Project's member. Not used in any computation, just for information purpose."
@@ -2540,3 +2565,6 @@ msgstr ""
 #~ msgstr ""
 #~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
 #~ "seleccionada"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index 4e716165a78..bd88b227967 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index d3b671b0248..565a837e4e6 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -652,7 +652,7 @@ msgstr "Järelejäänud tunnid"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 18f7b8b630d..853d059b201 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -650,7 +650,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 007b2a5c5d1..e1d6db8aa7c 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Uudet tehtävät"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -41,12 +41,12 @@ msgstr "Valittu yritys ei ole sallittu tälle käyttäjälle"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Edellinen kuukausi"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Omat tehtävät"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -81,7 +81,7 @@ msgstr "TARKISTA: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Käyttäjän sähköposti"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -93,7 +93,7 @@ msgstr "Työ tehty"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varoitus !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -108,7 +108,7 @@ msgstr "Tarkistettavat tunnit"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Odottavat projektit"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -122,7 +122,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Avaa projekti uudelleen"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Yritys"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Odottavat tehtävät"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -211,7 +211,7 @@ msgstr "Aseta odottamaan"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Tarkeä"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -258,7 +258,7 @@ msgstr "Päivä"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projektit ja vaiheet"
 
 #. module: project
 #: view:project.project:0
@@ -295,11 +295,12 @@ msgstr "Omat avoimet tehtävät"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Ole hyvä ja määrittele projektipäällikkö tai hänen sähköpostiosoitteensa."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Peruuttaaksesi tehtävän"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -320,7 +321,7 @@ msgstr "Projekti vs. jäljelläolevat tunnit"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Keskimääräinen suunniteltu tehokkuus"
 
 #. module: project
 #: help:project.task,active:0
@@ -361,7 +362,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Näytä vain tehtävät joilla on takaraja"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -384,7 +385,7 @@ msgstr "Sähköpostin ylätunniste"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Vaihda seuraavaan vaiheeseen"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -394,7 +395,7 @@ msgstr "Tehty tehtävä"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Väri-indeksi"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -404,7 +405,7 @@ msgstr "Konfiguraatio"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Kuluva kuukausi"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -466,17 +467,17 @@ msgstr "Määräaika"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Peruuta"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Valmis"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Vaihda väriä"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -492,7 +493,7 @@ msgstr " (kopio)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Uudet tehtävät"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -557,18 +558,18 @@ msgstr "Päivien määrä"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Avoimet projektit"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Sinun pitää määritellä projektin jäsenet '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Meneillään olevat tehtävät"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -592,7 +593,7 @@ msgstr "Projekti tehtävä"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Uusi"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -603,7 +604,7 @@ msgstr "Laskettu: käytetty aika + jäljelläoleva aika"
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Kumulatiivinen virtaus"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -625,12 +626,12 @@ msgstr "Uudelleenarvioi"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopio)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Ohituksen viive"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -641,7 +642,7 @@ msgstr "Keskitaso"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Odottavat tehtävät"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -653,19 +654,19 @@ msgstr "Jäljellä olevat tunnit"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Luontipäivämäärä"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Jäljellä oleva aika"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -788,6 +789,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Et voi poistaa projekteja jotka sisältävät tehtäviä. Suosittelen että se "
+"muutetaan epäaktiiviseen tilaan."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -812,7 +815,7 @@ msgstr "Viivästyneet tunnit"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Erittäin tärkeä"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -833,6 +836,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Jos valitset tämän kentän, projektipäällikkö saa aina sähköpostia kun jokin "
+"tehtävä valmistuu"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -866,7 +871,7 @@ msgstr "Vaiheet"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Vaihda edelliseen vaiheeseen"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -882,7 +887,7 @@ msgstr "Projektin aikayksikkö"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Käynnissä"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -909,7 +914,7 @@ msgstr "vanhempi"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Merkitse estetyksi"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -974,7 +979,7 @@ msgstr "Tehtävän vaihe"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Suunnittele"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -987,7 +992,7 @@ msgstr "Suunnitellut tunnit"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Tarkista tehtävän vaiheet"
 
 #. module: project
 #: view:project.project:0
@@ -997,7 +1002,7 @@ msgstr "Tila: (state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Antaa järjestyksen näytettäessä tehtäväluetteloa."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1022,7 +1027,7 @@ msgstr "Ylätason tehtävät"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Estetty"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1030,11 +1035,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Jos tehtävän valmistumisaste on 99.99%, sinun tulisi sulkea tehtävä jos se "
+"on valmis tai uudelleenarvioida aika."
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "kontaktin osoite"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1058,7 +1065,7 @@ msgstr "Laskutus"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Vaihtaaksesi deletointitilaan"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1085,7 +1092,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "Tarkista: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1120,7 +1127,7 @@ msgstr "Matala"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban tila"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1145,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Vaihda tyyppi"
 
 #. module: project
 #: help:project.project,members:0
@@ -1157,7 +1164,7 @@ msgstr "Projektipäällikkö"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Vaihtaaksesi valmis tilaan"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1174,7 +1181,7 @@ msgstr "Elokuu"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaali"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1185,7 +1192,7 @@ msgstr "Projektin nimi"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Tehtävähistoria"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1200,7 +1207,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Ole hyvä ja määrittele asiakas tai asiakkaan sähköpostiosoite."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1232,7 +1239,7 @@ msgstr "Uudelleen aktivoi"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Käyttäjä"
 
 #. module: project
 #: field:project.project,active:0
@@ -1253,7 +1260,7 @@ msgstr "Marraskuu"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Luo ensimmäiset projektisi"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1264,7 +1271,7 @@ msgstr "Projekti '%s' on suljettu"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Tehtävien kumulatiivinen virtaus"
 
 #. module: project
 #: view:project.task:0
@@ -1279,7 +1286,7 @@ msgstr "Lokakuu"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Tarkista suunniteltu aika ja avaa tehtävä"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1293,7 +1300,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Delegointien historia"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1322,7 +1329,7 @@ msgstr "Yritykset"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projektit joissa olen jäsenenä"
 
 #. module: project
 #: view:project.project:0
@@ -1414,7 +1421,7 @@ msgstr "Laajennetut Suotimet..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Ole hyvä ja poista tähän tunnukseen linkitetty projekti ensin."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1436,7 +1443,7 @@ msgstr "Tila"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Delegoitu käyttäjä tulisi olla määriteltynä"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1512,7 +1519,7 @@ msgstr "Käynnissä"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Tehtävien analyysi"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1521,11 +1528,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Alatason tehtävä yhä avoin.\n"
+"Ole hyvä ja peruuta tai merkitse valmiiksi se ensin."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Kaikille projekteille yhteiset vaiheet"
 
 #. module: project
 #: constraint:project.task:0
@@ -1547,7 +1556,7 @@ msgstr "Työaika"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projektit joissa olen päällikkönä"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1583,7 +1592,7 @@ msgstr "Erittäin vähäinen"
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Aikatauluta työtunnit säätääkseksi gantt diagrammin raporttia"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1684,7 +1693,7 @@ msgstr "Omat laskutettavat tilit"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Käyttöönotto"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1708,7 +1717,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Yhteinen kaikille projekteille"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1741,7 +1750,7 @@ msgstr "Tehtävä päivien mukaan"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Yrityksen nimi on jo käytössä!"
 
 #. module: project
 #: view:project.task:0
@@ -1761,7 +1770,7 @@ msgstr "Työn yhteenveto"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Toissakuukausi"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1771,7 +1780,7 @@ msgstr "Päivien määrä tehtävän valmistumiseksi"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Edellinen kuukausi"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1796,7 +1805,7 @@ msgstr "Avaa valmiiksimerkitty tehtävä"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Yhteinen"
 
 #. module: project
 #: view:project.task:0
@@ -1824,7 +1833,7 @@ msgstr "Tehtävä '%s' on suljettu"
 #. module: project
 #: field:project.task,id:0
 msgid "ID"
-msgstr ""
+msgstr "TUNNISTE (ID)"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
@@ -1835,7 +1844,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Määritellyt tehtävät"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1845,12 +1854,12 @@ msgstr "Ohitetut tehtävät"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Kuluva vuosi"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Virhe! Rekursiivisen kumppanin luonti ei ole sallittu."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1930,7 +1939,7 @@ msgstr "Tehtävä '%s' on peruttu"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Vaihtaaksesi avoimeen tilaan"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1964,7 +1973,7 @@ msgstr "Sähköpostiviestin alatunnite"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Meneilläänolevat tehtävät"
 
 #~ msgid "Close Task"
 #~ msgstr "Sulje tehtävä"
@@ -2326,3 +2335,6 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "otsikko"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Sähköpostin luonti velho"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index fa21a2b724b..1b8e319fa1a 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nouvelles tâches"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -43,12 +43,12 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mois précédent"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mes Tâches"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -83,7 +83,7 @@ msgstr "VALIDATION: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Courriel de l'utilisateur"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -95,7 +95,7 @@ msgstr "Travail effectué"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -105,12 +105,12 @@ msgstr "Déléguer une tâche"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Temps à valider"
+msgstr "Temps pour validation"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projets en attente"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Rouvrir le projet"
 
 #. module: project
 #: help:project.project,priority:0
@@ -196,7 +196,7 @@ msgstr "Société"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tâches en attente"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -216,7 +216,7 @@ msgstr "Mettre en attente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -264,7 +264,7 @@ msgstr "Jour"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projets et étapes"
 
 #. module: project
 #: view:project.project:0
@@ -300,12 +300,12 @@ msgstr "Mes tâches ouvertes"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Spécifier le nom du responsable ou son adresse de courriel."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Pour supprimer la tâche"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -370,7 +370,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Afficher seulement les tâches avec une date limite"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -393,7 +393,7 @@ msgstr "En-tête du courriel"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Faire passer à l'étape suivante"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -403,7 +403,7 @@ msgstr "Tâche terminée"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Couleur"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -413,7 +413,7 @@ msgstr "Configuration"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mois en cours"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -481,12 +481,12 @@ msgstr "_Annuler"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Prêt"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Modifier la couleur"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -502,7 +502,7 @@ msgstr " (copie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nouvelles tâches"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -512,7 +512,7 @@ msgstr "Nb de tâches"
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr "Précédent"
+msgstr "Précédente"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -553,7 +553,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr "Suivant"
+msgstr "Suivante"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -568,18 +568,18 @@ msgstr "Nb de jours"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Projets ouverts"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Vous devez assigner des membres au projet '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tâches en cours"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -604,18 +604,18 @@ msgstr "Tâche de projet"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculer comme: Temps passé + Temps restant"
+msgstr "Calculé comme : Temps passé + Temps restant."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flux cumulé"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -637,7 +637,7 @@ msgstr "Réévaluer"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Moyenne"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tâches en attente"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -665,19 +665,19 @@ msgstr "Heures restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Temps restant"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -689,7 +689,7 @@ msgstr "Temps planifié"
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr "Information"
+msgstr "Suivi"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -724,7 +724,7 @@ msgstr "En attente"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr "Titre délégué"
+msgstr "Intitulé"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -735,7 +735,7 @@ msgstr "Mes projets"
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "Infos Complémentaires"
+msgstr "Informations complémentaires"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -745,7 +745,7 @@ msgstr "Juillet"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Graphique d'avancement des tâches"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -804,6 +804,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Vous ne pouvez pas supprimer un projet qui contient des tâches. Par contre, "
+"vous pouvez le désactiver."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -828,7 +830,7 @@ msgstr "Retard en heures"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Très important"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -841,7 +843,7 @@ msgstr "Analyse des tâches"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Délégué"
+msgstr "Déléguer"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -849,6 +851,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Si vous cochez, le responsable recevra un courriel à chaque fois qu'une "
+"tâche est fermée par un des membres."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -882,7 +886,7 @@ msgstr "Étapes"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Revenir à l'étape précédente"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -898,7 +902,7 @@ msgstr "Unité de temps du projet"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -925,7 +929,7 @@ msgstr "Parent"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marquer comme bloquée"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -974,11 +978,11 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
-"Si la tâche est créée, le statut est 'Brouillon'.\n"
-" Si la tâche est démarrée, le statut devient 'En cours'.\n"
-" Si une revue est nécessaire, la tâche est en statut 'En attente'.           "
-"                       \n"
-" Si la tâche est terminée, le statut est 'Effectuée'."
+"Si la tâche est créée, son état est 'Brouillon'.\n"
+" Si la tâche est démarrée, l'état devient 'En cours'.\n"
+" Si une revue est nécessaire, l'état de la tâche est  'En attente'.          "
+"                        \n"
+" Si la tâche est terminée, l'état est 'Terminé'."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -1005,7 +1009,7 @@ msgstr "Étape de tâche"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Conception"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1018,17 +1022,17 @@ msgstr "Heures planifiées"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Réexaminer les étapes des tâches"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr "Statut: %(state)s"
+msgstr "État: %(state)s"
 
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Donne la séquence (l'ordre) d'affichage d'une liste de tâches"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1040,7 +1044,7 @@ msgstr "Date de début"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Prêt à avancer"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1053,7 +1057,7 @@ msgstr "Tâche parente"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqué"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1061,11 +1065,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Si la progression de la tâche est 99.99% vous devez soit clôturer la tâche "
+"si elle est terminée soit réévaluer le temps alloué"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adresse du contact"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1075,6 +1081,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"L'état kanban de la tâche indique différentes situations qui peuvent "
+"l'affecter:\n"
+" * Normal : situation par défaut\n"
+" * Bloqué  : indique que quelquechose empêche la tâche d'avancer\n"
+" * Prêt à avancer : indique que la tâche peut passer à l'étape suivante"
 
 #. module: project
 #: view:project.project:0
@@ -1089,7 +1100,7 @@ msgstr "Facturation"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Pour passer à l'état délégué"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1151,7 +1162,7 @@ msgstr "Basse"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "État kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1173,7 +1184,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Modifier le type"
 
 #. module: project
 #: help:project.project,members:0
@@ -1187,12 +1198,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Responsable du projet"
+msgstr "Responsable"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Pour passer à l'état terminé"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1209,7 +1220,7 @@ msgstr "Août"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1220,7 +1231,7 @@ msgstr "Nom du Projet"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Historique des tâches"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1235,7 +1246,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Préciser le client ou l'adresse de courriel du client"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1267,7 +1278,7 @@ msgstr "Ré-activer"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: project
 #: field:project.project,active:0
@@ -1288,7 +1299,7 @@ msgstr "Novembre"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Créer vos premiers projets"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1299,7 +1310,7 @@ msgstr "Le projet '%s' a été fermé."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Flux cumulé des tâches"
 
 #. module: project
 #: view:project.task:0
@@ -1314,7 +1325,7 @@ msgstr "Octobre"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Valider le temps prévu et ouvrir une tâche"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1328,7 +1339,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Historique des délégations"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1357,7 +1368,7 @@ msgstr "Sociétés"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projets dont je suis membre."
 
 #. module: project
 #: view:project.project:0
@@ -1408,7 +1419,7 @@ msgstr "Projets de l'utilisateur"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Déleguer"
+msgstr "_Déléguer"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1453,7 +1464,7 @@ msgstr "Filtres étendus..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Supprimer d'abord le projet lié avec ce compte analytique."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1475,7 +1486,7 @@ msgstr "État"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "L'utilisateur à qui la tâche est déléguée doit être spécifié"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1508,7 +1519,7 @@ msgstr ""
 #: view:report.project.task.user:0 selection:report.project.task.user,state:0
 #: view:res.partner:0 selection:task.by.days,state:0
 msgid "Done"
-msgstr "Effectué"
+msgstr "Terminé"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
@@ -1555,7 +1566,7 @@ msgstr "En cours"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analyse des tâches"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1564,11 +1575,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tâche enfant encore ouverte.\n"
+"Merci d' annuler ou de terminer d'abord  la tâche  enfant."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Étapes communes à tous les projets"
 
 #. module: project
 #: constraint:project.task:0
@@ -1591,7 +1604,7 @@ msgstr "Temps de Travail"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projets dans lesquels je suis membre"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1693,6 +1706,8 @@ msgid ""
 "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."
 msgstr ""
+"Si vous cochez ce champ, cette étape sera proposée par défaut sur chaque "
+"nouveau projet. elle ne s'appliquera pas aux projets existants."
 
 #. module: project
 #: view:board.board:0
@@ -1730,7 +1745,7 @@ msgstr "Mes comptes à facturer"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Déploiement"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1754,7 +1769,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Commun à tous les projets"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1787,7 +1802,7 @@ msgstr "Tâches par jour"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: project
 #: view:project.task:0
@@ -1807,7 +1822,7 @@ msgstr "Résumé des tâches"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mois -2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1817,7 +1832,7 @@ msgstr "Nb de jours pour effectuer la tâche"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mois -1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1842,7 +1857,7 @@ msgstr "Rouvrir les tâches terminées"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Commun"
 
 #. module: project
 #: view:project.task:0
@@ -1855,6 +1870,9 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Les étapes peuvent être communes à tous les projets ou spécifiques à un "
+"projet. Chaque tâche suivra les différentes étapes avant de pouvoir être "
+"fermée."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1876,12 +1894,12 @@ msgstr "Id."
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Graphe d'avancement"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tâches affectées"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1891,12 +1909,13 @@ msgstr "Tâches en dépassement"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Année en cours"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1916,8 +1935,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Le pied de page est ajouté à la fin de l'email pour le message "
-"d'avertissement envoyé au client lorsque la tâche est fermée"
+"Le pied de page est ajouté à la fin du courriel du message d'avertissement "
+"envoyé au client lorsque la tâche est fermée"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1931,15 +1950,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 projet contient des tâches ou des incidents qui seront effectués par vos "
-"ressources auxquels ils sont assignés. Un projet peut avoir une structure "
-"hiérarchique, comme être le fils d'un projet parent.Ceci vous permet de "
-"concevoir des structures de projet large avec différentes phases qui "
+"Un projet contient des tâches ou des incidents qui seront effectués ou "
+"traités par vos ressources auxquels ils sont assignés. Un projet peut avoir "
+"une structure hiérarchique, comme être le fils d'un projet parent. Ceci vous "
+"permet de concevoir des structures de projet avec différentes phases qui "
 "s'étalent pendant toute la durée d'un cycle. Chaque utilisateur peut "
 "s'attribuer un projet par défaut dans ces préférences pour automatiquement "
-"filtrer les tâches et les problèmes sur lesquels ils travaillent. Si vous "
+"filtrer les tâches et les incidents sur lesquels il travaille. Si vous "
 "choisissez de facturer le temps passé sur une tâche d'un projet, vous pouvez "
-"trouver les tâches de projet à facturer dans la section facturation."
+"retrouver les tâches de projet à facturer dans la section facturation."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1949,7 +1968,7 @@ msgstr "Travail effectué"
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr "État de Validation"
+msgstr "État de la validation"
 
 #. module: project
 #: code:addons/project/project.py:882
@@ -1985,7 +2004,7 @@ msgstr "La tâche '%s' est annulée."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Pour revenir à l'état ouvert"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2004,7 +2023,7 @@ msgstr "Envoyer un courriel après avoir fermé la tâche"
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr "Etapes des tâches"
+msgstr "Étapes des tâches"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -2019,7 +2038,7 @@ msgstr "Pied du courriel"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tâches en cours"
 
 #~ msgid "Reinclude the description of the task in the task of the user."
 #~ msgstr "Reprendre la description de la tâche dans la tâche de l'utilisateur."
@@ -2567,3 +2586,6 @@ msgstr ""
 
 #~ msgid "Manager Email"
 #~ msgstr "Courriel du responsable"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistant de composition de courriels"
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index c6fad807409..1fd6599bd96 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index b21d72a8a04..2df235ce585 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-02-17 04:57+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index f61a595ce09..ea508ead52c 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 "Language: hr\n"
 
 #. module: project
@@ -653,7 +653,7 @@ msgstr "Preostali Sati"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 2bee7f15171..693cc2f89ae 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -664,7 +664,7 @@ msgstr "Hátralévő idő"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index a16bf62eab4..e561d33b548 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 3ef2b7d7bb4..547b485bc7f 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -103,7 +103,7 @@ msgstr "Delega attività"
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Ore da convalidare"
+msgstr "Ore per la convalida"
 
 #. module: project
 #: view:project.project:0
@@ -660,7 +660,7 @@ msgstr "Ore Rimanenti"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 23af8d1c547..3fda3a1349c 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.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-21 05:16+0000\n"
-"X-Generator: Launchpad (build 15435)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -648,8 +648,8 @@ msgstr "残り時間数"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ウィザード"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1966,3 +1966,6 @@ msgstr "メールフッター"
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
 msgstr "進行中タスク"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Eメール作成ウィザード"
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 490c242c396..ca47b5b5e52 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "남은 시간"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 34374e5033f..a46b3c273c8 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,18 +24,18 @@ msgstr ""
 #. 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 "Pakartotinai įtraukite užduoties aprašymą vartotojo užduotyje"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Užduotis '%s' buvo priskirta %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Pasirinkta įmonė nėra galima šiam vartotojui"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -55,12 +55,12 @@ msgstr "Įspėti partnerį"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Įrašykite likusias valandas, reikalingas užduoties baigimui."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Galutiniai terminai"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -75,7 +75,7 @@ msgstr "Veiksmas neleidžiamas!"
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "Patikrinti: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -97,7 +97,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Užduoties delegavimas"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -125,17 +125,17 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Suteikia eiliškumą kai rodomas projektų sąrašas"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Klaida! Projekto pradžios data turi būti ankščiau nei baigimo data."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Pakartotinė užduotis"
 
 #. module: project
 #: field:project.project,members:0
@@ -150,7 +150,7 @@ msgstr "Deleguotos užduotys"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Kovas"
 
 #. module: project
 #: view:project.task:0
@@ -179,13 +179,13 @@ msgstr "Mano užduotys"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti pasikartojančių užduočių."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Įmonė"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -200,7 +200,7 @@ msgstr "Jūsų užduočių antraštė"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etapo pavadinimas"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -220,7 +220,7 @@ msgstr "Apibrėžkite reikalavimus ir planuojamas valanadas."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Pakeisti etapą"
 
 #. module: project
 #: view:project.project:0
@@ -230,7 +230,7 @@ msgstr "Naujas projektas naudojantis šablonu"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Klaida! Jūs negalite išplėsti projekto prie to paties projekto"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -241,18 +241,18 @@ msgstr "Labai skubus"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Vartotojas, kuriam norite priskirti šią užduotį"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mano užduotys"
 
 #. 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 "Diena"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
@@ -280,13 +280,13 @@ msgstr "Užduotis"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Dalyviai"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mano atviros užduotys"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -332,12 +332,12 @@ msgstr ""
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Užduoties konspektas"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Ne šabloninė užduotis"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -373,7 +373,7 @@ msgstr "Nutrauktas"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -413,7 +413,7 @@ msgstr "Deleguoti užduotis kitiems naudotojams"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -432,13 +432,13 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testuojama"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "Užduotis '%s' uždaryta"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -465,7 +465,7 @@ msgstr "Galutinis terminas"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Atšaukti"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -480,13 +480,13 @@ msgstr ""
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti pasikartojančių analitinių sąskaitų."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " .(kopijuoti)"
 
 #. module: project
 #: view:project.task:0
@@ -496,22 +496,22 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# užduočių"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Ankstesnis"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Priskirtas"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Sustabdymo data: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -536,12 +536,12 @@ msgstr "Mano projektai"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Klaida! Jūs negalite sukurti rekursyvių įmonių."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Sekantis"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -551,7 +551,7 @@ msgstr "Nuo projekto būsenos, pereis į vykdomą būseną ."
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dienos"
 
 #. module: project
 #: view:project.project:0
@@ -579,7 +579,7 @@ msgstr ""
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Naujos užduoties aprašymas"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
@@ -609,17 +609,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Faktinis valandų skaičius"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Testavimo užduoties antraštė"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Iš naujo įvertinti"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -653,7 +653,7 @@ msgstr "Likusios valandos"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -687,7 +687,7 @@ msgstr "Nepriskirtos užduotys"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Nepriskirtos užduotys"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -695,6 +695,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Suma visų darbo valandų, skirtų atlikti šio projekto, įskaitant susijusius "
+"projektus, užduotims."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -726,7 +728,7 @@ msgstr "Papildoma informacija"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Liepa"
 
 #. module: project
 #: view:project.task.history.burndown:0
@@ -753,7 +755,7 @@ msgstr "Projektai"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapas"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -767,7 +769,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Užduotis '%s' atidaryta."
 
 #. module: project
 #: view:project.task:0
@@ -777,7 +779,7 @@ msgstr "Datos"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Naujas pavadinimas užduoties, priskirtos vartotojui"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -800,7 +802,7 @@ msgstr "Atidarytų užduočių juodraščiai"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Sausis"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -817,7 +819,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Užduočių analizė"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -848,18 +850,18 @@ msgstr "Projektas"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Įvertinti"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mano lenta"
 
 #. 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 "Etapai"
 
 #. module: project
 #: view:project.task:0
@@ -886,7 +888,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projekto užduoties delegavimas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -902,7 +904,7 @@ msgstr "Užduotys"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Pirminis"
 
 #. module: project
 #: view:project.task:0
@@ -925,12 +927,12 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Rugsėjis"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Gruodis"
 
 #. module: project
 #: field:project.task,progress:0
@@ -950,13 +952,13 @@ msgstr ""
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Iš naujo įvertinti užduotį"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mėnuo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -967,7 +969,7 @@ msgstr "Projektų užduotys"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Užduoties etapas"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -1000,7 +1002,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Pradžios data"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1012,7 +1014,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Pirminės užduotys"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1051,7 +1053,7 @@ msgstr "Naudotojas:  %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Mokėjimas"
 
 #. module: project
 #: view:project.task:0
@@ -1061,13 +1063,13 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Svarbumas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Projektų šablonai"
 
 #. module: project
 #: view:project.project:0
@@ -1088,7 +1090,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Dalyviai"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1098,7 +1100,7 @@ msgstr "Projekto užduotys"
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Priskirto vartotojo užduoties baigimo tikėtinas laikas"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1157,12 +1159,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Užduotys pagal vartotoją ir projektą"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
@@ -1198,7 +1200,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Birželis"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1209,13 +1211,13 @@ msgstr "Iš viso laiko"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dienos iki uždarymo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projekto vitrina"
 
 #. module: project
 #: view:project.task:0
@@ -1236,12 +1238,12 @@ msgstr "Aktyvus"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dienos iki atidarymo"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Lapkritis"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1252,7 +1254,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projektas '%s' uždarytas."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1267,7 +1269,7 @@ msgstr "Užduoties redagavimas"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Spalis"
 
 #. module: project
 #: view:project.task:0
@@ -1289,7 +1291,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "Vartotojai"
 
 #. module: project
 #: help:project.project,active:0
@@ -1297,16 +1299,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Jei laukelis \"aktyvus\" yra nenustatytas, tai bus palikta galimybė paslėpti "
+"projektą jo neištrynus iš sistemos."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Vartotojai"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Įmonės"
 
 #. module: project
 #: view:project.project:0
@@ -1316,7 +1320,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Ieškoti projekto"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1333,7 +1337,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Vitrina"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1362,12 +1366,12 @@ msgstr "Naudotojo projektai"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Priskirti"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Dienų skaičiui iki užduoties atidarymo"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1377,7 +1381,7 @@ msgstr "Deleguotas"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
@@ -1396,12 +1400,12 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Testavimo užduoties antraštė"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Išplėsti filtrai..."
 
 #. module: project
 #: code:addons/project/project.py:1148
@@ -1435,7 +1439,7 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "Užduotis '%s' nustatyta kaip vykdoma"
 
 #. module: project
 #: view:project.project:0
@@ -1466,7 +1470,7 @@ msgstr "Atlikta"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Metai"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1478,7 +1482,7 @@ msgstr "Atšaukti"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Uždaryti"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1526,13 +1530,13 @@ msgstr ""
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Klaida! Užduočių pabaigos data turi būti vėliau nei pradžios data"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Atsakingas"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1591,7 +1595,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Mano užduočių galutiniai terminai"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
@@ -1601,7 +1605,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Kūrimas"
 
 #. module: project
 #: view:board.board:0
@@ -1622,7 +1626,7 @@ msgstr "Skubus"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Gegužė"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1632,7 +1636,7 @@ msgstr "Patvirtinta užduotis"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Viso užduočių"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1688,7 +1692,7 @@ msgstr "Projekto užduotys"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Užduotis '%s' atlikta"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1710,25 +1714,25 @@ msgstr "Kai užduotis atliekama, jos būsena tampa - atlikta."
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klientas"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Pabaigos data"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Vasaris"
 
 #. 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 "Užduotys pagal dienas"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1738,7 +1742,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Redaguoti"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1768,7 +1772,7 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Balandis"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1778,7 +1782,7 @@ msgstr "Sugaištos valandos"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Įvairūs"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1793,7 +1797,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Praleistos valandos"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1805,18 +1809,18 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Rikiavimo poreikiui projektų sąraše."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Užduotis '%s' uždaryta"
 
 #. 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
@@ -1832,7 +1836,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Uždelstos užduotys"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1892,7 +1896,7 @@ msgstr "Patvirtinimo būsena"
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "Užduotis '%s' atšaukta"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1900,22 +1904,24 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Apskaičiuotas laikas, kurio prireiks testuoti atliktas užduotis kitų "
+"vartotojų, kuriems priskyrėte darbus"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Vadovas"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Sukūrimo data"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Užduotis '%s' atšaukta."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1933,13 +1939,13 @@ msgstr "Partneris"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Siųsti el. paštą kai uždaroma užduotis"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Užduočių etapai"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -2179,11 +2185,6 @@ msgstr ""
 #~ msgid "Reactivate Project"
 #~ msgstr "Atnaujinti projektą"
 
-#, python-format
-#~ msgid "Couldn't send mail because your email address is not configured!"
-#~ msgstr ""
-#~ "Negalima išsiųsti laiško, kadangi nesukonfigūruotas elektronio pašto adresas!"
-
 #~ msgid "Delegate this task to a user"
 #~ msgstr "Deleguoti šią užduotį naudotojui"
 
@@ -2264,3 +2265,156 @@ msgstr ""
 
 #~ msgid "Running projects"
 #~ msgstr "Vykdomi projektai"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Problemų stebėjimas"
+
+#~ msgid "Timesheets"
+#~ msgstr "Tabelis"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projektai: Suplanuoti ir atliktos valandos"
+
+#~ msgid "Warn Message"
+#~ msgstr "Įspėjimo žinutė"
+
+#~ msgid "Invoice Address"
+#~ msgstr "Sąskaitos faktūros adresas"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Jei aktyvuojamas projekte šis nustatymas, padeda sugeneruoti sąskaitas "
+#~ "faktūras pagal atliktų užduočių sugaištą darbo laiką."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Nustatykite projektų valdymo programą"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mėnuo...   "
+
+#~ msgid "Specification"
+#~ msgstr "Specifikacija"
+
+#~ msgid "Methodologies"
+#~ msgstr "Metodologija"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "Kliento el. pašto adresas"
+
+#~ msgid "Public Notes"
+#~ msgstr "Vieši užrašai"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    ....Mėnuo-1....    "
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Prašome nurodyti projekto vadovo el. pašto adresą"
+
+#~ msgid "Image"
+#~ msgstr "Paveiksliukas"
+
+#~ msgid "Long Term Planning"
+#~ msgstr "Ilgalaikė prognozė"
+
+#~ msgid "  Year  "
+#~ msgstr "  ..Metai..  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr ""
+#~ "Padeda buhalteriui valdyti analitines sąskaitas ir susikertančius biudžetus."
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "Klaida! Jūs negalite sukurti rekursyvių susijusių dalyvių"
+
+#~ msgid "Task Edition"
+#~ msgstr "Užduoties versija"
+
+#~ msgid "Configure"
+#~ msgstr "Nustatyti"
+
+#~ msgid "Customer Email"
+#~ msgstr "Kliento el. pašto adresas"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Perspėti vadovą el. paštu"
+
+#~ msgid "Manager Email"
+#~ msgstr "Vadovo el. pašto adresas"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Klaida! Valiuta turi būti tokia pati kaip ir pasirinktos įmonės valiuta"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Nustatymo progresas"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Negalima išsiųsti laiško, kadangi nenusistatėte savo el. pašto adreso!"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Atlikti užduotis"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Perspėti klientą el. paštu"
+
+#~ msgid "Send Email"
+#~ msgstr "Siųsti el. paštą"
+
+#~ msgid "Current Activity"
+#~ msgstr "Dabartinė veikla"
+
+#~ msgid ""
+#~ "GTD is a methodology to efficiently organise yourself and your tasks. This "
+#~ "module fully integrates GTD principle with OpenERP's project management."
+#~ msgstr ""
+#~ "DTG yra metodologija, kuri efektyviai padeda organizuotis darbus. Šis "
+#~ "modulis pilnai integruojasi GTD principu su OpenERP projektų valdymu."
+
+#~ msgid "Current"
+#~ msgstr "Dabartinis"
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Įgalina ilgalaikių projektų sekimą, įskaitant kelių fazių projektus ir "
+#~ "resursų priskyrimo valdymą."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Mokėjimo laikas užduotyse"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "Projekto vadovo el. pašto adresas"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr "Negalima išsiųsti el. pašto! Patikrinkite SMTP serverio nustatymus"
+
+#~ msgid "Warn Customer"
+#~ msgstr "Perspėti klientą"
+
+#~ msgid "Merge"
+#~ msgstr "Sulieti"
+
+#~ msgid "_Send"
+#~ msgstr "_Siūsti"
+
+#~ msgid "title"
+#~ msgstr "pavadinimas"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Automatiškai sinchronizuoti projektų užduotis su CRM atvejais"
+
+#~ msgid "Budgets"
+#~ msgstr "Biudžetai"
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index dda63acf5c9..e1d51f24862 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -31,7 +31,7 @@ msgstr "Ievietot uzdevuma aprakstu lietotāja uzdevumā"
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "Uzdevums '%s' tika deliģēts %s."
+msgstr "Uzdevums '%s' tika deleģēts %s."
 
 #. module: project
 #: constraint:res.users:0
@@ -243,7 +243,7 @@ msgstr "Ļoti steidzams"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr "Lietotājs, kuram gribat deliģēt šo uzdevumu"
+msgstr "Lietotājs, kuram gribat deleģēt šo uzdevumu"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -657,7 +657,7 @@ msgstr "Atlikušās Stundas"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -786,7 +786,7 @@ msgstr "Datumi"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr "Jauns lietotājam deliģēta uzdevuma virsraksts"
+msgstr "Jauns lietotājam deleģēta uzdevuma virsraksts"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -1394,7 +1394,7 @@ msgstr "Lietotāja Projekti"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Deliģēt"
+msgstr "_Deleģēt"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1680,7 +1680,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr "Mani deliģētie uzdevumi"
+msgstr "Mani deleģētie uzdevumi"
 
 #. module: project
 #: view:project.project:0
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 30a8adb1018..0ea447b09a6 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -13,39 +13,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Шинэ даалгаврууд"
 
 #. 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 "Даалгаврын тайлбарыг хэрэглэгчийн даалгавар дотор дахин оруулах"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "The task '%s' has been delegated to %s."
+msgstr "'%s' даалгавар %s-д ацлагдлаа."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Сонгосон компани энэ хэрэглэгчид зөвшөөрөгдсөн компаниуд дунд алга."
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Өмнөх сар"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Миний даалгаврууд"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -55,7 +55,7 @@ msgstr "Харилцагчид анхааруулах"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Ажлыг дуусгахад шаардагдах үлдэгдэл цагийг энд оруул"
 
 #. module: project
 #: view:project.task:0
@@ -80,7 +80,7 @@ msgstr "ШАЛГАХ: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Хэрэглэгчийн Имэйл"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,12 +92,12 @@ msgstr "Ажил дууссан"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Сануулга !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr "Даалгавар шилжүүлэх"
+msgstr "Даалгаврыг ацаглах"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -107,7 +107,7 @@ msgstr "Хянах цаг"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Хүлээгдэж байгаа Төслүүд"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -115,26 +115,28 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Бүх үлдсэн цаг нь даалгаврын хариуцагчаар тогтмол хугацаанд дахин "
+"тооцоологдож болно"
 
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Төслийг дахин нээх"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Төслүүдийн жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Даалгаврыг дахин үнэлэх"
 
 #. module: project
 #: field:project.project,members:0
@@ -144,7 +146,7 @@ msgstr "Төслийн гишүүд"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Даалгавруудыг шилжүүлгээр нь"
+msgstr "Даалгаврыг ацаглалтаар"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -154,12 +156,12 @@ msgstr "3 сар"
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "Delegated tasks"
+msgstr "Ацаглагдсан Даалгаврууд"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "Шилжүүлэгдсэн даалгаварууд"
+msgstr "Ацаглагдсан Даалгаврууд"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -189,7 +191,7 @@ msgstr "Компани"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Хүлээгдэж байгаа даалгаврууд"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -199,7 +201,7 @@ msgstr "Даалгаврын гарчиг"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Нэр"
+msgstr "Үеийн нэр"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -209,7 +211,7 @@ msgstr "Хүлээлгэх"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Чухал"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -229,7 +231,7 @@ msgstr "Загвар дээр суурилсан шинэ төсөл"
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Алдаа! Ижил төсөлд томруулалтыг олгох боломжгүй."
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -240,7 +242,7 @@ msgstr "Маш яаралтай"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "Даалгаврыг ацаглах хэрэглэгч"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -256,7 +258,7 @@ msgstr "Өдөр"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Төслүүд болон Үеүүд"
 
 #. module: project
 #: view:project.project:0
@@ -292,12 +294,12 @@ msgstr "Миний нээлттэй даалгаврууд"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Төслийн менежер эсвэл Төслийн менежерийн имэйл хаягийг зааж өгнө үү."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Даалгаврыг цуцлахад"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -327,6 +329,10 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Энэ талбар нь автомат тооцоологдоог бөгөөд 'active' буюу идэвхтэй гэх "
+"boolean талбартай ижил байдлаар ажилладаг: хэрэв даалгавар нь үлгэр эсвэл "
+"идэвхгүй төсөлтэй холбогдсон бол харагддаггүй талбар, гэхдээ тухайлан "
+"асуувал харуулж болно."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -336,7 +342,7 @@ msgstr "Даалгаврын товч утга"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Даалгаврын Үлгэр Биш"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -358,7 +364,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Зөвхөн дуусах хугацаатай даалгавруудыг харуулах"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -381,7 +387,7 @@ msgstr "Мэйлийн толгой"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Дараачийн үе рүү өөрчлөх"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -391,7 +397,7 @@ msgstr "Дууссан даалгавар"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Өнгөний Индекс"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -401,12 +407,12 @@ msgstr "Тохиргоо"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Энэ сар"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Даалгаврыг өөр хэрэглэгчид ацаглах"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
@@ -424,11 +430,13 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Хэрэв үүнийг тэмдэглэвэл даалгаврыг хаахад захиалагчид имэйл илгээхийг санал "
+"болгосон имэйлийн цонх гарч ирнэ."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Шалгаж байна"
 
 #. module: project
 #: code:addons/project/project.py:829
@@ -466,12 +474,12 @@ msgstr "_Цуцлах"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Бэлэн"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Өнгө Өөрчлөх"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -487,7 +495,7 @@ msgstr " (хувилах)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Шинэ даалгавар"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -502,17 +510,17 @@ msgstr "Өмнөх"
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Оноогдсон"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Зогсоох Огноо: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ижил нэвтрэх нэртэй хоёр хэрэглэгч байж болохгүй!"
 
 #. module: project
 #: view:project.project:0
@@ -532,7 +540,7 @@ msgstr "Миний төслүүд"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
 
 #. module: project
 #: view:project.task:0
@@ -552,23 +560,23 @@ msgstr "# Өдрийн"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Нээлттэй Төслүүд"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Энэхүү '%s' төсөлд гишүүд оноох ёстой !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Боловсруулагдаж байгаа даалгаврууд"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr ""
+msgstr "Бүх хийх ёстой даалгварын хаагдсан даалгаврын эзлэх хувь."
 
 #. module: project
 #: view:project.task.delegate:0
@@ -587,7 +595,7 @@ msgstr "Төслийн даалгавар"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -598,7 +606,7 @@ msgstr "Бодолт: Зарцуулсан цаг + Үлдсэн цаг."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Хуримдлагдсан Урсгал"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -620,7 +628,7 @@ msgstr "Дахин үнэлэх"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (хуулбар)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -636,7 +644,7 @@ msgstr "Дундаж"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Хүлээгдэж байгаа Даалгаврууд"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -648,19 +656,19 @@ msgstr "Үлдсэн цаг"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн Огноо"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Үлдсэн хугацаа"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -682,7 +690,7 @@ msgstr "Эзэнгүй даалгаврууд"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Хэрэглэгчид оноогдоогүй даалгаврууд"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -690,6 +698,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон охин төсөлд холбогдох бүх даалгаврын төлөвлөсөн нийлбэр "
+"хугацаа."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -705,7 +715,7 @@ msgstr "Шийд хүлээсэн"
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Ацагласан Гарчиг"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -726,7 +736,7 @@ msgstr "7 сар"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Даалгаврын Гал унтраалтын Диаграмм"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -757,6 +767,9 @@ 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 ""
+"Төсөлд хэрэглэгдэх даалгаврын үеүүдийг тодорхойл. Энэ үе нь даалгавар "
+"эхлэхээс эхлээд дуусах хүртэлх алхамууд юм. Энэ үеийн тусламжтайгаар "
+"даалгавар эсвэл асуудлын үеүүдийг хөтлөж явцыг хянахад тустай бадйаг."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -772,7 +785,7 @@ msgstr "Огноонууд"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Ацагласан даалгаварын шинэ гарчиг"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -781,11 +794,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Даалгавар агуулж байгаа төслийг устгах боломжгүй. Идэвхгүй болгохыг зөвлөе."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Төсөл болон Төлөвлөсөн цаг, Нийт цагийн харьцуулалт"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -805,7 +819,7 @@ msgstr "Саатлын цаг"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Маш чухал"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -818,7 +832,7 @@ msgstr "Даалгавар шинжилгээ"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Delegate"
+msgstr "Ацаглах"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -826,6 +840,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Хэрэв энэ талбарыг тэмдэглэвэл даалгавар дуусах бүрт төслийн менежер имэйл "
+"хүлээн авах болно."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -859,7 +875,7 @@ msgstr "Үе"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Өмнө үе рүү өөрчлөх"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -875,13 +891,13 @@ msgstr "Төслийн цагийн нэгж"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Эхэлсэн"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Төслийн даалгавар шилжүүлэх"
+msgstr "Төслийн даалгавар ацаглах"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -902,7 +918,7 @@ msgstr "Эцэг"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Хоригдсоноор Тэмдэглэх"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -916,6 +932,14 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Даалгавар гэдэг нь хийх ёстой ажлыг илтгэнэ. Хэрэглэгч бүр нь өөрийн "
+"даалгавар дээр ажиллах бөгөөд түүндээ ажилласан цагаа хөтлөх боломжтой. "
+"Хэрэв та ямар нэг даалгаварыг хэн нэгэнд ацаглах юм бол хүлээж байгаа "
+"төлөвтэй өөр шинэ даалгавартай болох бөгөөд энэ нь хийсэн ажлыг ревюү хийх "
+"үед дахин нээгдэнэ. Хэрэв project_timesheet буюу төслийн цагийн хуудас "
+"модулийг суулгах юм бол төслийн тохиргоо дээр үндэслэн ажилласан цагаа "
+"нэхэмжлэх боломжтой. Харин project_mrp модулийн тусламжтай борлуулалтын "
+"захиалга батлагдахад автоматаар төслийн даалгаврыг үүсгэх мөн боломжтой."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -972,7 +996,7 @@ msgstr "Даалгаврын үе"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Зохиомж"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -985,7 +1009,7 @@ msgstr "Төлөвлөсөн цаг"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Даалгаврын үеийг үзлэг"
 
 #. module: project
 #: view:project.project:0
@@ -995,7 +1019,7 @@ msgstr "Төлөв: %(төлөв)"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Даалгаврын жагсаалтыг харуулах дарааллын эрэмбийг өгнө."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1007,7 +1031,7 @@ msgstr "Эхлэх огноо"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Чирэхэд Бэлэн"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1020,7 +1044,7 @@ msgstr "Эцэг даалгавар"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Хоригдсон"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1028,11 +1052,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Даалгаврын тооцоолсон хугацаа нь 99.99% болсон бол энэ даалгаврыг хаах нь "
+"зохимжтой."
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Холбогдох хаяг"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1042,6 +1068,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Даалгаврын канбан төлөв нь үүнд нөлөөлж байгаа тохиолдлуудыг харуулна:\n"
+" * Энгийн гэдэг нь нөхцөл байдлын анхны утга\n"
+" * Хоригдсон гэдэг нь ямар нэг зүйл даалгаврыг цааш үргэлжлүүлэхэд садаа "
+"болж байгаа илтгэнэ.\n"
+" * Чирэхэд Бэлэн гэдэг нь даалгаврыг дараачийн үе рүү нь чирэхэд бэлэн гэсэн "
+"утгыг илтгэнэ."
 
 #. module: project
 #: view:project.project:0
@@ -1051,12 +1083,12 @@ msgstr "Хэрэглэгч: %(user_id)"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Тооцоо"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Ацаглах төлөвийг өөрчлөхдөө"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1083,7 +1115,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "ШАЛГАЛТ: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1098,7 +1130,7 @@ msgstr "Төслийн даалгаврууд"
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Энэ даалгаврыг гүйцээхэд ацагласан хэрэглэгчийн таамаг хугацаа"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1117,7 +1149,7 @@ msgstr "Бага"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Канбан Төлөв"
 
 #. module: project
 #: view:project.project:0
@@ -1131,11 +1163,14 @@ 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 ""
+"Энэ тайлан нь өөрийн төсөл болон хэрэглэгчдийн биелэлтийг шинжлэх боломжийг "
+"өгдөг. Даалгаврын тоо хэмжээ, зарцуулсан цаг төлөвлөсөн цагийн харьцуулалт, "
+"даалгаврыг нээж хаах дундаж хугацаа зэрэгийг шинжлэх боломжтой."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Төрлийг солих"
 
 #. module: project
 #: help:project.project,members:0
@@ -1143,6 +1178,7 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Төслийн гишүүд гэдэг нь төслийн даалгавруудруу хандаж чадах хэрэглэгчид юм."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1152,7 +1188,7 @@ msgstr "Төслийн Менежер"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Төлөвийг хийгдсэн болгож өөрчлөхөд"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1169,7 +1205,7 @@ msgstr "8 сар"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Энгийн"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1180,7 +1216,7 @@ msgstr "Төслийн нэр"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Даалгавруудын Түүх"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1188,12 +1224,14 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Таны өөрийн даалгаврын шинэ төлөв. Ацагласан даалгавар хаагдахад автоматаар "
+"хүлээгдэж байгаа төлөвтэйгээр дахин нээгдэнэ."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Захиалагч эсвэл захиалагчийн имэйл хаягийг зааж өгнө үү."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1225,7 +1263,7 @@ msgstr "Дахин идэвхжүүлэх"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #. module: project
 #: field:project.project,active:0
@@ -1246,7 +1284,7 @@ msgstr "11 сар"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Өөрийн анхны төслүүдээ үүсгэ"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1257,7 +1295,7 @@ msgstr "Төсөл '%s' хаагдлаа."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Даалгавруудын Хуримтлагдсан Урсгал"
 
 #. module: project
 #: view:project.task:0
@@ -1272,7 +1310,7 @@ msgstr "10 сар"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Төлөвлөсөн цагийг шалгаад даалгаврыг нээ"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1280,11 +1318,13 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Төслийн менежерийн төлөвлөсөн цаг болон даалгаврын нийт цагийн ялгаа болгож "
+"тооцоологдсон."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Ацагласан Түүх"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1297,6 +1337,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар нь False буюу Худал гэж тохируулагдсан бол төслийг "
+"устгалгүйгээр нуух боломжийг олгодог."
 
 #. module: project
 #: view:project.task:0
@@ -1311,7 +1353,7 @@ msgstr "Компаниуд"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Би гишүүн нь болсон төслүүд."
 
 #. module: project
 #: view:project.project:0
@@ -1342,6 +1384,9 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Энэ нь төсөл болон даалгаврыг хэмжих нэгж нь болно. Хэрэв төсөлтэй "
+"холбогдсон цагийн хуваарь (project_timesheet модуль) хэрэглэж байгаа бол "
+"ажилчдад зөв хэмжих нэгж тохируулахаа мартаж болохгүй."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1358,17 +1403,17 @@ msgstr "Хэрэглэгчийн төслүүд"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Төлөөлөгч"
+msgstr "_Ацаглах"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Даалгаврыг нээх хүртэлх өдөр"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "рүү шилжүүлэх"
+msgstr "Ацаглагдсан нь"
 
 #. module: project
 #: view:res.partner:0
@@ -1386,6 +1431,8 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Даалгаврыг хийх таамагласан хугацаа бөгөөд ихэнхдээ даалгаврыг ноорог "
+"төлөвтэй байхад нь төслийн менежер тогтоож өгдөг."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
@@ -1401,7 +1448,7 @@ msgstr "Өргөтгөсөн хайлт..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Энэ данстай холбогдсон төслийг эхлээд устгана уу."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1423,7 +1470,7 @@ msgstr "Төлөв"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Ацагласан хэрэглэгч заагдсан байх хэрэгтэй"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1443,6 +1490,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Төсөл дээр санхүүгийн менежмент хиймээр байгаа бол төсөлд шинжилгээний "
+"дансыг холбох ёстой. Энэ нь төслийн цагийн хуудас, өртөг, төсөв, төлөвлөсөн "
+"өртөг, төлөвлөсөн орлого зэрэгийг шинжлэх боломжийг олгодог."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1499,7 +1549,7 @@ msgstr "Явж байна"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Даалгаврын Шинжилгээ"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1507,23 +1557,24 @@ msgstr ""
 msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
-msgstr ""
+msgstr "Дэд даалгавар нээлттэй хэвээр байна."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Бүх төслүүдэд ерөнхий үеүүд"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Хариуцагч"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1533,7 +1584,7 @@ msgstr "Ажлын цаг"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Би менежер нь байгаа төслүүд"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1549,7 +1600,7 @@ msgstr " Төслүүд ба хугацааг харьцуулах"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr "Шилжүүлсэн даалгавар"
+msgstr "Ацагласан даалгавар"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1557,6 +1608,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон дэд төслүүдийн холбогдох даалгавруудын зарцуулсан хугацааны "
+"нийлбэр."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1567,7 +1620,7 @@ msgstr "Маш бага"
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Гант диаграмын тайланг тохируулах ажлын цагийн хуваарь"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1577,7 +1630,7 @@ msgstr "Менежерт анхааруулах"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Товлосон Хугацаа хэтэрсэн"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1592,7 +1645,7 @@ msgstr "Даалгаврыг дахин үнэлүүлэх"
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Хөгжүүлэлт"
 
 #. module: project
 #: view:board.board:0
@@ -1631,13 +1684,15 @@ msgid ""
 "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."
 msgstr ""
+"Хэрэв энэ талбарыг тэмдэглэвэл энэ үе нь бүх төсөл дээр анхны утга болно. "
+"Одоо байгаа төслүүдэд энэ хамаагүй."
 
 #. 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 "Миний ацагласан даалгаврууд"
 
 #. module: project
 #: view:project.project:0
@@ -1668,7 +1723,7 @@ msgstr "Дансны нэхэмжлэх"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Суулгалт"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1687,11 +1742,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Энэ төсөл болон дэд төслүүдийн холбогдох даалгавруудын нийт хугацааны "
+"нийлбэр."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Бүх төсөлд ерөнхий"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1724,7 +1781,7 @@ msgstr "Даалгаврыг өдрүүдээр харуулах"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Компаний нэр үл давхцах байх ёстой !"
 
 #. module: project
 #: view:project.task:0
@@ -1744,7 +1801,7 @@ msgstr "Ажлын тойм"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Сар-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1754,7 +1811,7 @@ msgstr "Даалгаврыг хаах өдрүүдийн тоо"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Сар-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1779,12 +1836,12 @@ msgstr "Дууссан даалгавар нээх"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Ерөнхий"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Зарцуулсан цаг"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1792,11 +1849,13 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Үеүүд нь бүх төслүүдэд ерөнхий байх эсвэл зарим нэг төсөлд тухайлсан байх "
+"боломжтой. Даалгавар бүр нь хаагдах хүртлээ ялгаатай үеүүдийг туулна."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Төслийн жагсаалтыг харуулах дарааллын эрэмбийг өгнө"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
@@ -1813,12 +1872,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Гал унтраалтын Диаграмм"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Оноогдсон Даалгаврууд"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1828,12 +1887,12 @@ msgstr "Алгассан даалгаврууд"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Энэ жил"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Рекурсив холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1868,6 +1927,14 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Төсөл бүр нь даалгавар болон асуудлын олонлог байх бөгөөд үүнд оноогдсон "
+"нөөц нь даалгаврыг гүйцэтгэнэ. Төсөл нь мөчирлөсөн бүтэцтэй буюу охин, эцэг "
+"гэсэн бүтэцтэй байж болно. Энэ нь том төслийг олон шатуудад хуваан түүнийгээ "
+"дэд төсөл байдлаар зохиожлох боломжийг өгдөг. Хэрэглэгч бүр өөрийн "
+"хэрэглэгчийн тохиргоондоо өөрийн төслийн анхны утгыг тохируулах боломжтой. "
+"Ингэснээр даалгавар болон асуудал нь автоматаар өөрийн төслөөр нь шүүгдэнэ. "
+"Хэрэв төслийн даалгаварт зарцуулсан цагтаа нэхэмжлэл үүсгэхээр бол төлбөр "
+"тооцоо хэсэгт нэхэмжэлж болох даалгавруудаг харах боломжтой."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1890,7 +1957,7 @@ msgstr "Даалгавар '%s' цуцлагдсан."
 msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
-msgstr ""
+msgstr "Ацагласан даалгаврыг шалгахад таны зарцуулах таамаг хугацаа"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1911,7 +1978,7 @@ msgstr "Даалгавар '%s'-г цуцалсан."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Нээлттэй төлөвтэй болгоход"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1924,7 +1991,7 @@ msgstr "Харилцагч"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Даалгаврыг хаасан дараагаараа имэйл илгээх"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
@@ -1935,7 +2002,7 @@ msgstr "Даалгаврын үе"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Өөр хэрэглэгчид өөрийн даалгаврыг ацаглах"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
@@ -1945,7 +2012,7 @@ msgstr "Мэйлийн хөл"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Боловсруулагдаж байгаа даалгаврууд"
 
 #~ msgid "Contact"
 #~ msgstr "Харьцах хүн"
@@ -2265,3 +2332,6 @@ msgstr ""
 
 #~ msgid "Budgets"
 #~ msgstr "Төсөв"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "И-мэйл үүсгэх харилцах цонх"
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index 943814adea3..ccb1d91c49d 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Gjenstående timer"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index c3373a8b42f..7ec14fe77f2 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-11 05:07+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nieuwe taak"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -40,12 +40,12 @@ msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Vorige Maand"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mijn taken"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +80,7 @@ msgstr "CONTROLEER: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Gebruikers e-mail"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +92,7 @@ msgstr "Voltooide taken"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +107,7 @@ msgstr "Te bevestigen uren"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Lopende projecten"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Her-open project"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Bedrijf"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -201,7 +201,7 @@ msgstr "Titel van uw taak"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Naam stadium"
+msgstr "Naam fase"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -211,7 +211,7 @@ msgstr "Zet op wachtend"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Belangrijk"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -221,7 +221,7 @@ msgstr "Definiëer de benodigdheden en de geplande uren."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr "Stadium wijzigen"
+msgstr "Wijzig fase"
 
 #. module: project
 #: view:project.project:0
@@ -258,7 +258,7 @@ msgstr "Dag"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projecten en taken fases"
 
 #. module: project
 #: view:project.project:0
@@ -294,12 +294,12 @@ msgstr "Mijn openstaande taken"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Definieer de projectmanager of e-mail adres van de projectmanager"
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Hiermee annuleert u de taak"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -364,7 +364,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Geef alleen taken met een deadline weer"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -387,7 +387,7 @@ msgstr "Kopregels mail"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Verander naar volgende fase"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -397,7 +397,7 @@ msgstr "Voltooide taak"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Kleur index"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -407,7 +407,7 @@ msgstr "Instellingen"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Huidige maand"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -475,12 +475,12 @@ msgstr "_Annuleren"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Gereed"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Wijzig kleur"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -496,7 +496,7 @@ msgstr " (kopie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nieuwe taak"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -561,18 +561,18 @@ msgstr "# Dagen"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Open Projecten"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "U dient gebruikers aan het project '%s' toe te wijzen!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Taken in behandeling"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -596,7 +596,7 @@ msgstr "Projecttaak"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -607,7 +607,7 @@ msgstr "Berekend als: Gebruikte uren + resterende uren."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Cumulative flow"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -629,7 +629,7 @@ msgstr "Herevalueren"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr "Gemiddeld"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -657,19 +657,19 @@ msgstr "Resterende uren"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Aanmaakdatum"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Resterende tijd"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -737,7 +737,7 @@ msgstr "Juli"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Burndown grafiek van taken"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -759,7 +759,7 @@ msgstr "Projecten"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Stadium"
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -769,8 +769,8 @@ msgid ""
 "order to track the progress in solving a task or an issue."
 msgstr ""
 "Definieer de te gebruiken stappen in het project vanaf het maken van de taak "
-"tot en met het sluiten van de taak of probleem. U gebruikt deze stadia om "
-"het verloop van een taak of probleem te volgen."
+"tot en met het sluiten van de taak of probleem. U gebruikt deze fases om het "
+"verloop van een taak of probleem te volgen."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -795,6 +795,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Het is niet mogelijk een project, welke taken bevat, te verwijderen. U kunt "
+"hte beste het project deactiveren."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -819,7 +821,7 @@ msgstr "Uren vertraging"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Heel belangrijk"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -840,6 +842,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Indien u deze optie aanvinkt, krijgt de projectmanager een e-mail, iedere "
+"keer een taak is afgerond door zijn team."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -868,12 +872,12 @@ msgstr "Mijn dashboard"
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr "Stadia"
+msgstr "Taken fases"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Verander naar vorige fase"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -889,7 +893,7 @@ msgstr "Tijdseenheid project"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "In behandeling"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -916,7 +920,7 @@ msgstr "Bovenliggend"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Maarkeer als geblokkeerd"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -993,7 +997,7 @@ msgstr "Taak status"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Ontwerp"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1006,7 +1010,7 @@ msgstr "Geplande uren"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Controleer uw taakfases"
 
 #. module: project
 #: view:project.project:0
@@ -1016,7 +1020,7 @@ msgstr "Status: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Geeft de volgorde weer wanneer de lijst van taken wordt weergegeven."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1028,7 +1032,7 @@ msgstr "Startdatum"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Gereed om binnen te trekken"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1041,7 +1045,7 @@ msgstr "Bovenliggende taken"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Geblokkeerd"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1049,11 +1053,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Indien de taak een voortgang heeft van 99,99%, kunt u, indien de taak gereed "
+"is, het beste de taak afsluiten of de tijd herzien"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres contactpersoon"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1063,6 +1069,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Een Kanban status van ene taak geeft specifieke situaties weer:\n"
+"* Normaal is de standaard situatie\n"
+"* Geblokkeerd geeft aan dat iets het verdere verloop van de taak blokkeert\n"
+"* Gereed om binnen te trekken geeft aan dat een taak gereed is om naar de "
+"volgende taak te slepen"
 
 #. module: project
 #: view:project.project:0
@@ -1077,7 +1088,7 @@ msgstr "In rekening brengen"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de delegeer status"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1104,7 +1115,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CHECK: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1149,7 @@ msgstr "Laag"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban Status"
 
 #. module: project
 #: view:project.project:0
@@ -1160,7 +1171,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Veraander type"
 
 #. module: project
 #: help:project.project,members:0
@@ -1179,7 +1190,7 @@ msgstr "Projectleider"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de gereed status"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1196,7 +1207,7 @@ msgstr "Augustus"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1207,7 +1218,7 @@ msgstr "Naam project"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Taakhistorie"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1222,7 +1233,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Definieer de klant of het e-mail adres van de klant."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1254,7 +1265,7 @@ msgstr "Heractiveren"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: project
 #: field:project.project,active:0
@@ -1275,7 +1286,7 @@ msgstr "November"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Maak uw eerste projecten aan"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1286,7 +1297,7 @@ msgstr "Het project '%s' is gesloten."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Taken cumulative flow"
 
 #. module: project
 #: view:project.task:0
@@ -1301,7 +1312,7 @@ msgstr "Oktober"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Bevestigen de geplande tijd en geopende taak"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1315,7 +1326,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Deligatiehistorie"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1344,7 +1355,7 @@ msgstr "Bedrijven"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projecten waarvan ik deelnemer ben*"
 
 #. module: project
 #: view:project.project:0
@@ -1441,7 +1452,7 @@ msgstr "Uitgebreide filters..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Verwijder eerst het project dat aan deze kostenplaats is gekoppeld"
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1463,7 +1474,7 @@ msgstr "Status"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "De gedelegeerde gebruiker moet worden gespecificeerd"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1543,7 +1554,7 @@ msgstr "In uitvoering"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Takenanalyse"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1552,11 +1563,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Onderliggende taken zijn nog open.\n"
+"Annuleer of maak eerst onderliggende taken af."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Fases van taken, geldend voor alle projecten"
 
 #. module: project
 #: constraint:project.task:0
@@ -1577,7 +1590,7 @@ msgstr "Werktijd"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "projecten waarvan ik manager ben"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1618,7 +1631,7 @@ msgstr "Rooster met werktijden ter correctie van de GANTT-diagrammen."
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "Waarschuw manager"
+msgstr "Waarschuw projectleider"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
@@ -1677,6 +1690,8 @@ msgid ""
 "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."
 msgstr ""
+"Indien u dit veld aanvinkt, wordt de fase standaard voorgesteld voor ieder "
+"nieuw project. het zal deze fase niet toewijzen aan bestaande projecten."
 
 #. module: project
 #: view:board.board:0
@@ -1714,7 +1729,7 @@ msgstr "Mijn declaratierekeningen"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Implementatie"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1739,7 +1754,7 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Normaal voor alle projecten"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1772,7 +1787,7 @@ msgstr "Taken per dag"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "De naam van het bedrijf moet uniek zijn!"
 
 #. module: project
 #: view:project.task:0
@@ -1792,7 +1807,7 @@ msgstr "Samenvatting werk"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Maand-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1802,7 +1817,7 @@ msgstr "Aantal dagen tot sluiten taak"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Maand-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1812,7 +1827,7 @@ msgstr "April"
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr "Gespendeerde uren"
+msgstr "Gewerkte uren"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1827,7 +1842,7 @@ msgstr "Open voltooide taak"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: project
 #: view:project.task:0
@@ -1840,6 +1855,9 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"De fase van een taak kan algemeen zijn voor alle projecten of voor een "
+"specifiek project. Iedere taak zal diverse fases doorlopen, voordat deze "
+"wordt afgesloten."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1861,12 +1879,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndown grafiek"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Toegewezen taken"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1876,12 +1894,13 @@ msgstr "Overschreden taken"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Huidig jaar"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1969,7 +1988,7 @@ msgstr "De taak '%s' is geannuleerd."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Hiermee wijzigt u naar de open status"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2003,7 +2022,7 @@ msgstr "Mail voetregels"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Lopende taken"
 
 #~ msgid "Validate"
 #~ msgstr "Valideren"
@@ -2544,3 +2563,6 @@ msgstr ""
 
 #~ msgid "Helps accountants manage analytic and crossover budgets."
 #~ msgstr "Helpt accountants analytische en crossover budgetten te beheren."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-mail opmaak wizard"
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index d5e149532e3..f9ff0c939de 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -24,18 +24,20 @@ msgstr ""
 #. 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 "De omschrijving van de taak ook opnemen in de taak van de gebruiker"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Taak '%s' is gedelegeerd aan %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"De gekozen firma behoort niet tot de toegelaten bedrijven voor deze "
+"gebruiker."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -50,23 +52,23 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Relatie informeren"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Zet hier de resterende uren die nodig zijn om de taak af te werken."
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Deadlines"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr ""
+msgstr "Deze bewerking is niet toegelaten."
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -75,7 +77,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "CONTROLE: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -85,7 +87,7 @@ msgstr ""
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr ""
+msgstr "Werk uitgevoerd"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
@@ -97,12 +99,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Gedelegeerde taak"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Goed te keuren uren"
 
 #. module: project
 #: view:project.project:0
@@ -115,6 +117,8 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Totale resterende tijd; kan periodiek worden herbekeken door de uitvoerder "
+"van de taak."
 
 #. module: project
 #: view:project.project:0
@@ -124,42 +128,42 @@ msgstr ""
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Bepaalt de volgorde bij het weergeven van een lijst van projecten."
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "De begindatum van het project moet voor de einddatum liggen."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Projectleden"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Taak per gedelegeerde"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Gedelegeerde taken"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Gedelegeerde taken"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -167,22 +171,24 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Koptekst aan het begin van een e-mail die bij het afsluiten van een taak "
+"naar de klant wordt gestuurd."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr ""
+msgstr "Mijn taken"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "U kunt niet dezelfde taken maken."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -192,17 +198,17 @@ msgstr ""
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Uw taaktitel"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Fasenaam"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Op wachtend zetten"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -212,44 +218,44 @@ msgstr ""
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Stel de vereisten in en de geplande uren."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Status wijzigen"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Nieuw project volgens model"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "U kunt niet escaleren binnen eenzelfde project"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Heel dringend"
 
 #. module: project
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "De gebruiker aan wie u deze taak wilt delegeren"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mijn taken"
 
 #. 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 "Dag"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
@@ -259,12 +265,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Instellen als model"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Voorlopige taak"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -272,18 +278,18 @@ msgstr ""
 #: field:project.task.history.cumulative,task_id:0
 #: field:project.task.work,task_id:0 view:report.project.task.user:0
 msgid "Task"
-msgstr ""
+msgstr "Taak"
 
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Leden"
 
 #. module: project
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr ""
+msgstr "Mijn openstaande taken"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -300,23 +306,23 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projecttaakwerk"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Opmerkingen"
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Project vs. resterende uren"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gem. gepland-eff."
 
 #. module: project
 #: help:project.task,active:0
@@ -325,32 +331,37 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Dit veld wordt automatisch berekend en werkt op dezelfde manier als het veld "
+"'Actief'. Als een taak aan een model of aan een niet-actief project is "
+"gekoppeld, wordt ze verborgen tot ze wordt opgevraagd."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Taaksamenvatting"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Dit is geen modeltaak"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr ""
+msgstr "Taak starten"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Taak is afgewerkt"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Automatische variabelen voor kop– en voetteksten. Gebruik dezelfde "
+"schrijfwijze."
 
 #. module: project
 #: view:project.task:0
@@ -363,17 +374,17 @@ msgstr ""
 #: selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Koptekst mail"
 
 #. module: project
 #: view:project.task:0
@@ -383,7 +394,7 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Afgewerkte taak"
 
 #. module: project
 #: field:project.task,color:0
@@ -393,7 +404,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -403,17 +414,17 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Hiermee delegeert u taken aan een andere gebruiker"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Uitgevoerd door"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -421,44 +432,46 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Als u dit inschakelt, krijgt de gebruiker bij het afsluiten van een taak het "
+"voorstel om een mail naar de klant te sturen."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Testen"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr ""
+msgstr "Taak '%s' afgesloten"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Berekend volgens de som van het uitgevoerde taakwerk."
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planning"
 
 #. module: project
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Deadline"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuleren"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -473,13 +486,13 @@ msgstr ""
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "U kunt niet dezelfde analytische rekeningen maken."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopie)"
 
 #. module: project
 #: view:project.task:0
@@ -489,62 +502,62 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# taken"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Einddatum: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "U kunt geen twee gebruikers met dezelfde login maken."
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Opnieuw instellen als project"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr ""
+msgstr "Model"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr ""
+msgstr "Mijn projecten"
 
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "U kunt niet dezelfde bedrijven maken."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "De taak gaat van status \"Voorlopig\" naar \"Open\"."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dagen"
 
 #. module: project
 #: view:project.project:0
@@ -566,17 +579,19 @@ msgstr ""
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Percentage afgesloten taken in functie van het totaal aantal uit te voeren "
+"taken."
 
 #. module: project
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Nieuwe taakomschrijving"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Projecttaak"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -589,7 +604,7 @@ msgstr ""
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Berekend als: Bestede tijd + resterende tijd"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
@@ -601,17 +616,17 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Bestede uren"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Titel voor valideringstaak"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Opnieuw inschatten"
 
 #. module: project
 #: code:addons/project/project.py:597
@@ -622,13 +637,13 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Overschrijdingstijd"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Gemiddeld"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -641,11 +656,11 @@ msgstr ""
 #: field:project.vs.hours,remaining_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Resterende uren"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -664,12 +679,12 @@ msgstr ""
 #: field:project.task.history,planned_hours:0
 #: field:project.task.history.cumulative,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Geplande tijd"
 
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -679,14 +694,14 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Taken die niet zijn toegewezen aan gebruikers"
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som geplande uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -697,28 +712,28 @@ 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 ""
+msgstr "Wachtend"
 
 #. module: project
 #: field:project.task.delegate,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Totel gedelegeerde taak"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr ""
+msgstr "Mijn projecten"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: project
 #: view:project.task.history.burndown:0
@@ -728,7 +743,7 @@ msgstr ""
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: project
 #: code:addons/project/project.py:324
@@ -737,7 +752,7 @@ msgstr ""
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr ""
+msgstr "Projecten"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -745,7 +760,7 @@ msgstr ""
 #: field:project.task.history.cumulative,type_id:0
 #: 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
@@ -754,22 +769,25 @@ 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 ""
+"Bepaal de stappen die in het project zullen worden gebruikt: van het maken "
+"van een taak tot het afsluiten van een taak of een probleem. U kunt deze "
+"fasen gebruiken om de voortgang van een taak of probleem op te volgen."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Taak '%s' is geopend."
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datums"
 
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Nieuwe titel van de gedelegeerde taak"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -782,22 +800,22 @@ msgstr ""
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Project vs. geplande en totale uren"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Voorlopige / Open taak"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Opgelopen vertraging"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -809,13 +827,13 @@ msgstr ""
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Taakanalyse"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegeren"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -835,23 +853,23 @@ msgstr ""
 #: model:res.request.link,name:project.req_link_project
 #: field:res.users,context_project_id:0 field:task.by.days,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Project"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Inschatten"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mijn dashboard"
 
 #. 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 "Fasen"
 
 #. module: project
 #: view:project.task:0
@@ -862,12 +880,12 @@ msgstr ""
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Projectbeheer"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Projecttijdeenheid"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -878,7 +896,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projecttaak delegeren"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -889,12 +907,12 @@ msgstr ""
 #: model:process.process,name:project.process_process_tasksprocess0
 #: view:project.task:0 view:res.partner:0 field:res.partner,task_ids:0
 msgid "Tasks"
-msgstr ""
+msgstr "Taken"
 
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Hoofd"
 
 #. module: project
 #: view:project.task:0
@@ -913,21 +931,30 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"Een taak betekent werk dat moet worden uitgevoerd. Elke gebruiker heeft zijn "
+"eigen takenlijst waarvoor hij uren taakwerk kan boeken. Hij kan zelf werken "
+"aan een taak, deze afsluiten of delegeren aan een andere gebruiker. Als u "
+"een taak doorgeeft aan een andere gebruiker, krijgt u een nieuwe taak in "
+"status \"Wachtend\" die wordt heropend op het ogenblik dat u de gedelegeerde "
+"taak kunt evalueren. Met de module project_timesheet kan het taakwerk worden "
+"gefactureerd afhankelijk van de instellingen van het project. Met de module "
+"project_mrp kunnen taken automatisch worden gemaakt zodra een verkooporder "
+"wordt bevestigd."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Voortgang (%)"
 
 #. module: project
 #: help:project.task,state:0
@@ -938,28 +965,33 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Bij het aanmaken, heeft een taak status 'Voorlopig'.\n"
+" Als de taak is gestart, komt ze in status 'Open'.\n"
+" Als de taak moet worden nagekeken, krijgt ze status 'Wachtend'.             "
+"                     \n"
+" Als de taak is afgewerkt, komt ze op 'Gereed'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Taakfase"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -972,7 +1004,7 @@ msgstr ""
 #: field:project.vs.hours,planned_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Geplande uren"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
@@ -982,7 +1014,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Status: %(state)s"
 
 #. module: project
 #: help:project.task,sequence:0
@@ -992,7 +1024,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1004,7 +1036,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Hoofdtaken"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1038,12 +1070,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Gebruiker: %(user_id)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Facturatie"
 
 #. module: project
 #: view:project.task:0
@@ -1053,23 +1085,23 @@ msgstr ""
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Modelprojecten"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Beheer"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -1080,30 +1112,32 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Lid"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Geschatte tijd die de gedelegeerde gebruiker nodig heeft om de taak af te "
+"werken"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
 #: view:project.task:0 selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Voorlopig"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: project
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
@@ -1114,7 +1148,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Prestatie"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1123,6 +1157,10 @@ 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 ""
+"Met dit rapport kunt u de prestaties van uw projecten en gebruikers "
+"analyseren. U kunt het aantal taken, de bestede uren ten opzichte van de "
+"geplande, het gemiddelde aantal dagen om een taak te openen of af te "
+"sluiten, enz."
 
 #. module: project
 #: view:project.task:0
@@ -1135,11 +1173,13 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Projectleden zijn gebruikers die toegang krijgen tot de taken van het "
+"betrokken project."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projectmanager"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1149,12 +1189,12 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Taken per gebruiker en project"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
@@ -1166,7 +1206,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Projectnaam"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1180,6 +1220,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Nieuwe status van uw eigen taak. Wachtende taak wordt automatisch heropend "
+"als de gedelegeerde taak wordt afgesloten."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1190,29 +1232,29 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Totale tijd"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagen tot afsluiten"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr ""
+msgstr "Projectdashboard"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reactiveren"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
@@ -1222,18 +1264,18 @@ msgstr ""
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagen tot openen"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1244,7 +1286,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Project '%s' is afgesloten."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1254,12 +1296,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr ""
+msgstr "Taak bewerken"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: project
 #: view:project.task:0
@@ -1281,7 +1323,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1289,16 +1331,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Als het veld Actief is uitgeschakeld, kunt u het project verbergen zonder "
+"het te verwijderen."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bedrijven"
 
 #. module: project
 #: view:project.project:0
@@ -1308,24 +1352,24 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Zoeken in projecten"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Project '%s' is geopend."
 
 #. module: project
 #: field:project.task.history,date:0
 #: field:project.task.history.cumulative,date:0 field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1334,43 +1378,46 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
+"Hiermee bepaalt u de meeteenheid voor projecten en taken.\n"
+"Als u ook werkt met uurroosters voor projecten (project_timesheet module), "
+"mag u niet vergeten de juiste meeteenheid te gebruiken voor uw medewerkers."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Projecten van de gebruiker"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegeren"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Aantal dagen tot openen van taak"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Gedelegeerd aan"
 
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historiek"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -1378,16 +1425,18 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Geschatte tijd om de taak uit te voeren. Doorgaans wordt deze in de "
+"voorlopige taak ingesteld door de projectmanager."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Titel voor uw valideringstaak"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: project
 #: code:addons/project/project.py:1148
@@ -1400,7 +1449,7 @@ msgstr ""
 #: view:report.project.task.user:0
 #: field:report.project.task.user,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Totaal aantal uren"
 
 #. module: project
 #: view:project.task:0 field:project.task,state:0
@@ -1409,7 +1458,7 @@ msgstr ""
 #: field:project.vs.hours,state:0 view:report.project.task.user:0
 #: field:report.project.task.user,state:0 field:task.by.days,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: project
 #: code:addons/project/project.py:925
@@ -1421,12 +1470,12 @@ msgstr ""
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr ""
+msgstr "Taak '%s' is open gezet."
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Begindatum: %(date_start)s"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -1435,6 +1484,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Koppel dit project aan een analytische rekening als u financiële opvolging "
+"van uw projecten wilt doen. Hiermee kunt u projecten aan budgetten koppelen, "
+"kosten– en batenanalyse, uurroosters koppelen aan projecten, enz."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1444,40 +1496,40 @@ msgstr ""
 #: view:report.project.task.user:0 selection:report.project.task.user,state:0
 #: view:res.partner:0 selection:task.by.days,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gereed"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
 #: view:project.project:0 view:project.task:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Taak openen"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr ""
+msgstr "Openen"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "ID: %(task_id)s"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1486,7 +1538,7 @@ msgstr ""
 #: selection:project.task.history.cumulative,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Lopende"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1510,12 +1562,13 @@ msgstr ""
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Let op: de einddatum van de taak moet na de begindatum van de taak liggen"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1531,30 +1584,30 @@ msgstr ""
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Taak '%s' staat in wacht."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Project vs. uren"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Gedelegeerde taak"
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som bestede uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Zeer laag"
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1564,58 +1617,58 @@ msgstr ""
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Manager inlichten"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Deadline overschreden"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Deadlines van mijn taken"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Taak opnieuw inschatten"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Ontwikkeling"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Mijn resterende uren per project"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Dringend"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Valideringstaak"
 
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Totaal taken"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1629,33 +1682,33 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_delegate_task_tree
 #: view:project.task:0
 msgid "My Delegated Tasks"
-msgstr ""
+msgstr "Mijn gedelegeerde taken"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Taak: %(name)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: project
 #: field:project.project,progress_rate:0 view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Voortgang"
 
 #. module: project
 #: field:project.project,effective_hours:0 field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Bestede tijd"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Mijn te factureren rekeningen"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -1665,20 +1718,20 @@ msgstr ""
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Projecttaken"
 
 #. module: project
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Taak '%s' is afgewerkt."
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Som totale uren van alle taken in dit project en in subprojecten."
 
 #. module: project
 #: field:project.task.type,project_default:0
@@ -1688,30 +1741,30 @@ msgstr ""
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Een afgewerkte taak heeft status Gereed."
 
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klant"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. 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 "Taken per dag"
 
 #. module: project
 #: sql_constraint:res.company:0
@@ -1721,17 +1774,17 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Geef uw gepresteerde uren in."
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "Werkomschrijving"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1741,7 +1794,7 @@ msgstr ""
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Aantal dagen tot afsluiten van taak"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1751,22 +1804,22 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Bestede uren"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diversen"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Taak geopend / afgesloten"
 
 #. module: project
 #: view:project.task.type:0
@@ -1776,7 +1829,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Gepresteerde uren"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1788,18 +1841,18 @@ msgstr ""
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Bepaalt de volgorde bij het weergeven van een lijst van projecten."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Taak '%s' afgesloten"
 
 #. 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
@@ -1815,7 +1868,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Taken over tijd"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1831,13 +1884,13 @@ msgstr ""
 #: field:project.project,priority:0 field:project.project,sequence:0
 #: field:project.task,sequence:0 field:project.task.type,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. 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 "Resterende uren per project"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1845,6 +1898,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Voettekst aan het begin van een e-mail die bij het afsluiten van een taak "
+"naar de klant wordt gestuurd."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1858,22 +1913,30 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Een project bevat een aantal taken of problemen die door uw mensen worden "
+"uitgevoerd of opgelost. Een project kan volgens een hiërarchische structuur "
+"worden gemaakt, als onderdeel van een hoofdproject. Hiermee kunt u "
+"uitgebreide projectstructuren opzetten volgens diverse fasen tijdens de duur "
+"van het project. Elke gebruiker kan zijn standaardproject instellen in zijn "
+"eigen voorkeuren om automatisch taken of problemen waaraan hij werkt in dit "
+"project te zien. Als u facturen maakt op basis van gespresteerd taakwerk, "
+"gebruikt u de factuurinformatie op een project."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Taakwerk"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Valideringsstatus"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr ""
+msgstr "Taak '%s' is geannuleerd."
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1881,22 +1944,24 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Geschatte tijd voor het nakijken van het werk uitgevoerd door de gebruiker "
+"aan wie u de taak delegeert."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Taak '%s' is geannuleerd."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -1908,29 +1973,29 @@ msgstr ""
 #: field:project.task,partner_id:0 view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: project
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Mail sturen na afsluiten van taak"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Taakfasen"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Delegeer uw taak aan een andere gebruiker"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Voettekst van mail"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1941,3 +2006,246 @@ msgstr ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "Toegewezen taken"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Probleemopvolging"
+
+#~ msgid "Timesheets"
+#~ msgstr "Uurroosters"
+
+#~ msgid "Delegations"
+#~ msgstr "Gedelegeerde taken"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projecten: geplande vs. totale uren"
+
+#~ msgid "Warn Message"
+#~ msgstr "Waarschuwingsbericht"
+
+#~ msgid "Project Close Task"
+#~ msgstr "Projecttaak sluiten"
+
+#~ msgid "Invoice Address"
+#~ msgstr "Factuuradres"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Hiermee maakt u facturen volgens taakwerk indien dit voor het project is "
+#~ "ingesteld."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Stel uw toepassing voor projectbeheer in"
+
+#~ msgid "   Month   "
+#~ msgstr "   Maand   "
+
+#~ msgid "Reactivate Project"
+#~ msgstr "Project opnieuw actief maken"
+
+#~ msgid ""
+#~ "Tracks and helps employees encode and validate timesheets and attendances."
+#~ msgstr ""
+#~ "Hiermee kunnen medewerkers hun uurroosters en aanwezigheden ingeven en "
+#~ "goedkeuren."
+
+#~ msgid "Specification"
+#~ msgstr "Specificatie"
+
+#~ msgid "Methodologies"
+#~ msgstr "Methodologieën"
+
+#~ msgid "Email Address of Customer"
+#~ msgstr "E-mailadres van de klant"
+
+#~ msgid "Public Notes"
+#~ msgstr "Openbare notities"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Maand-1    "
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "Er zijn diverse OpenERP-toepassingen beschikbaar voor projectbeheer, met "
+#~ "verschillende niveaus van controle en flexibiliteit."
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Gelieve het e-mailadres van de projectmanager op te geven."
+
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
+#~ msgid "Computed as: Time Spent / Total Time."
+#~ msgstr "Berekend als: Bestede tijd / totale tijd"
+
+#~ msgid "Long Term Planning"
+#~ msgstr "Langetermijnplanning"
+
+#~ msgid "  Year  "
+#~ msgstr "  Jaar  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "Hiermee kunnen boekhouders analytische en gekruiste budgetten maken."
+
+#~ msgid "Error ! You can not create recursive associated members."
+#~ msgstr "U kunt niet dezelfde leden maken."
+
+#~ msgid "Task Edition"
+#~ msgstr "Taak bewerken"
+
+#~ msgid "Configure"
+#~ msgstr "Instellen"
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr ""
+#~ "Implementeert en volgt de concepten en taaktypes uit de SCRUM-methodologie."
+
+#~ msgid "Parent Project"
+#~ msgstr "Hoofdproject"
+
+#~ msgid "Customer Email"
+#~ msgstr "E-mail klant"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Manager inlichten via e-mail"
+
+#~ msgid "Manager Email"
+#~ msgstr "E-mail manager"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "De munt moet gelijk zijn aan de munt van de geselecteerde firma"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Configuratievoortgang"
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Mail kan niet worden verstuurd, omdat uw e-mailadres niet is ingesteld."
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Getting Things Done"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Klant informeren via e-mail"
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "Projectbeheermodule doet de opvolging van projecten op verschillende "
+#~ "niveaus, taken, taakwerk, enz. Het inplannen en rangschikken van taken kan "
+#~ "ook.\n"
+#~ " Dashboard voor projectleden met:\n"
+#~ "    * Lijst van openstaande taken\n"
+#~ "    * Leden van het project\n"
+#~ "    "
+
+#~ msgid "Month works"
+#~ msgstr "Werk tijdens de maand"
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr ""
+#~ "U kunt een project met taken niet verwijderen. Wij raden u aan het om niet-"
+#~ "actief te zetten."
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "Gelieve het e-mailadres van de klant op te geven."
+
+#~ msgid "Send Email"
+#~ msgstr "E-mail verzenden"
+
+#~ msgid "Current Activity"
+#~ msgstr "Huidige activiteit"
+
+#~ 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 is een methodologie waarmee u uzelf en uw taken efficiënt kunt "
+#~ "organiseren. Deze module integreert de GTD-principes met OpenERP's "
+#~ "projectbeheer."
+
+#~ msgid "Current"
+#~ msgstr "Huidig"
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "Berekend als het verschil tussen de door de projectmanager geschatte tijd en "
+#~ "de reële tijd om de taak te sluiten."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Hiermee kunt u projecten op lange termijn opvolgen, met meerdere fasen en "
+#~ "toewijzing van mensen."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Tijd van taken facturen"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "Project instellen"
+
+#~ msgid ""
+#~ "If you check this field, the project manager will receive a request each "
+#~ "time a task is completed by his team."
+#~ msgstr ""
+#~ "Als u dit veld inschakelt, krijgt de projectmanager een verzoek bij elke "
+#~ "taak die wordt afgewerkt door zijn team."
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "E-mailadres van de projectmanager"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't send mail! Check the email ids and smtp configuration settings"
+#~ msgstr ""
+#~ "Kan geen e-mail versturen. Kijk de e-mailadressen en smtp-instellingen na."
+
+#~ msgid "Warn Customer"
+#~ msgstr "Klant informeren"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "Mijn projecten: geplande vs. totale uren"
+
+#~ msgid "project.installer"
+#~ msgstr "project.installer"
+
+#~ msgid "Merge"
+#~ msgstr "Samenvoegen"
+
+#~ msgid "_Send"
+#~ msgstr "_Verzenden"
+
+#~ msgid "title"
+#~ msgstr "Titel"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Automatisch projecttaken en crm-meldingen synchroniseren."
+
+#~ msgid "Budgets"
+#~ msgstr "Budgetten"
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index b37fe72b5e1..e521d434bcd 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nowe zadania"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -40,12 +40,12 @@ msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Poprzedni miesiąc"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Moje zadania"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -80,7 +80,7 @@ msgstr "SPRAWDŹ: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Adres pocztowy użytkownika"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,7 +92,7 @@ msgstr "Praca wykonana"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -107,7 +107,7 @@ msgstr "Godziny do zatwierdzenia"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projekty oczekujące"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Ponownie otwórz projekt"
 
 #. module: project
 #: help:project.project,priority:0
@@ -191,7 +191,7 @@ msgstr "Firma"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Zadania oczekujące"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -211,7 +211,7 @@ msgstr "Ustaw na oczekujące"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Ważne"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -258,7 +258,7 @@ msgstr "Dzień"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projekty i etapy"
 
 #. module: project
 #: view:project.project:0
@@ -294,12 +294,12 @@ msgstr "Moje otwarte zadania"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Wprowadź Menedżera projektu lub adres mailowy menedżera projektu"
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Do anulowania zadania"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -363,7 +363,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Pokaż tylko zadania z podanym terminem"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -386,7 +386,7 @@ msgstr "Magłówek wiadomości"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Zmień etap na następny"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -396,7 +396,7 @@ msgstr "Zadanie wykonane"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Indeks kolorów"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -406,7 +406,7 @@ msgstr "Konfiguracja"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Bieżący miesiąc"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -473,12 +473,12 @@ msgstr "_Anuluj"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Gotowe"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Zmień kolor"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -494,7 +494,7 @@ msgstr " (kopia)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nowe zadania"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -559,18 +559,18 @@ msgstr "# dni"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Otwarte projekty"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Musisz przypisac uczestników do projektu '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Zadania w toku"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -594,7 +594,7 @@ msgstr "Zadanie projektu"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nowe"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -605,7 +605,7 @@ msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Przepływ kumulacyjny"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -627,7 +627,7 @@ msgstr "Ponownie oszacuj"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -643,7 +643,7 @@ msgstr "Średni"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Oczekujące zadania"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -655,19 +655,19 @@ msgstr "Pozostałe godziny"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data utworzenia"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Pozostały czas"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -734,7 +734,7 @@ msgstr "Lipiec"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Wykres wykonania zadań"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -792,6 +792,7 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Nie możesz usuwać projektu z zadaniami. Sugerujemy deaktywację projektu."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -816,7 +817,7 @@ msgstr "Opóźnienie"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Bardzo ważne"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -837,6 +838,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Jeśli zaznaczysz to pole, to menedżer projektu otrzyma wiadomość po "
+"zakończeniu każdego zadania."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -870,13 +873,13 @@ msgstr "Etapy"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Zmień na poprzedni etap."
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Projekty"
+msgstr "Zarządzanie projektem"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -886,7 +889,7 @@ msgstr "Jednostka czasu w projekcie"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "W toku"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -913,7 +916,7 @@ msgstr "Nadrzędny"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Zaznacz jako zablokowane"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -992,7 +995,7 @@ msgstr "Etap zadania"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Projektowanie"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1005,7 +1008,7 @@ msgstr "Planowane godziny"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Przegląd etapów zadań"
 
 #. module: project
 #: view:project.project:0
@@ -1015,7 +1018,7 @@ msgstr "Stan: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Określa kolejność wyświetlania zadań w listach"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1027,7 +1030,7 @@ msgstr "Data Rozpoczęcia"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Gotowe do zatrzymania"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1040,7 +1043,7 @@ msgstr "Zadania nadrzędne"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Zablokowane"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1048,11 +1051,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Jeśli zadanie ma postęp 99,99%, to powinieneś je zamknąć lub przeszacować "
+"czas"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adres kontaktu"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1062,6 +1067,10 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Stan kanban zadania oznacza specjalne sytuacje:\n"
+" * Normalne oznacza sytuację typową\n"
+" * Zablokowane oznacza, że coś przeszkadza w postępie zadania\n"
+" * Gotowe do przejścia oznacza, że zadanie może przejść do następnego etapu"
 
 #. module: project
 #: view:project.project:0
@@ -1076,7 +1085,7 @@ msgstr "Fakturowanie"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Do zmiany stanu na delegowane"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1103,7 +1112,7 @@ msgstr ""
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "SPRAWDŹ: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1138,7 +1147,7 @@ msgstr "Niski"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Stan Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1159,7 +1168,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Zmień typ"
 
 #. module: project
 #: help:project.project,members:0
@@ -1167,6 +1176,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Członkowie projektu to użytkownicy, którzy mają dostęp do zadań związanych z "
+"tym projektem."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1176,7 +1187,7 @@ msgstr "Menedżer projektu"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Do zmiany w stan wykonane"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1193,7 +1204,7 @@ msgstr "Sierpień"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalne"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1204,7 +1215,7 @@ msgstr "Nazwa projektu"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Historia zadań"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1219,7 +1230,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Podaj klienta lub adres mailowy klienta"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1251,7 +1262,7 @@ msgstr "Reaktywuj"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Użytkownik"
 
 #. module: project
 #: field:project.project,active:0
@@ -1272,7 +1283,7 @@ msgstr "Listopad"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Utwórz swój pierwszy projekt"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1283,7 +1294,7 @@ msgstr "Projekt '%s' został zamknięty."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Kumulacyjny przepływ zadań"
 
 #. module: project
 #: view:project.task:0
@@ -1298,7 +1309,7 @@ msgstr "Październik"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Zatwierdź planowany czas i otwórz zadanie"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1312,7 +1323,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Historia przydziałów"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1341,7 +1352,7 @@ msgstr "Firmy"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projekty. których jestem członkiem"
 
 #. module: project
 #: view:project.project:0
@@ -1437,7 +1448,7 @@ msgstr "Rozszerzone filtry..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Usuń najpierw projekt związany z tym kontem."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1459,7 +1470,7 @@ msgstr "Stan"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Oddelegowani pracownicy powinni być wyspecyfikowani"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1538,7 +1549,7 @@ msgstr "W toku"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analiza zadań"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1547,16 +1558,18 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Zadania podrzędne są otwarte.\n"
+"Najpierw anuluj lub zakończ zadania podrzędne."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapy wspólne dla wsystkich projektów"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Błąd ! Data końcowa musi być późniejsza niż data początkowa"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1572,7 +1585,7 @@ msgstr "Czas pracy"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projekty, których jestem menedżerem"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1609,6 +1622,7 @@ msgstr "Bardzo niski"
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
 msgstr ""
+"Rozkład godzin roboczych do uwzględnienia w raporcie z wykresem Gantta"
 
 #. module: project
 #: field:project.project,warn_manager:0
@@ -1672,6 +1686,8 @@ msgid ""
 "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."
 msgstr ""
+"Jeśli to zaznaczysz, to ten etap będzie domyślnie proponowany dla każdego "
+"nowego projektu. W bieżących projektach etap się nie zmieni."
 
 #. module: project
 #: view:board.board:0
@@ -1709,7 +1725,7 @@ msgstr "Moje konta do fakturowania"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Rozwój"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1732,7 +1748,7 @@ msgstr "Suma godzin wszystkich zadań tego projektu i projektów podrzędnych."
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Wspólne dla wszystkich projektów"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1765,7 +1781,7 @@ msgstr "Zadania wg dni"
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nazwa firmy musi być unikalna !"
 
 #. module: project
 #: view:project.task:0
@@ -1785,7 +1801,7 @@ msgstr "Podsumowanie pracy"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Miesiąc-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1795,7 +1811,7 @@ msgstr "Liczba dni do zamknięcia zadania"
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Miesiąc-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1820,7 +1836,7 @@ msgstr "Otwórz wykonane zadania"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Wspólne"
 
 #. module: project
 #: view:project.task:0
@@ -1833,6 +1849,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapy mogą być jednakowe dla wszystkich projektów lub różne dla różnych "
+"projektów. Każde zadanie przejdzie różne etapy, aby zostać wykonanym."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1854,12 +1872,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Wykres wykonania"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Przypisane zadania"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1869,12 +1887,12 @@ msgstr "Zadania przeterminowane"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Bieżący rok"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych obiektów."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1961,7 +1979,7 @@ msgstr "Zadanie '%s' zostało anulowane."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Do zmiany stanu na otwarty"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1995,7 +2013,7 @@ msgstr "Stopka wiadomości"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Zadania w toku"
 
 #~ msgid "All Tasks"
 #~ msgstr "Wszystkie zadania"
@@ -2508,3 +2526,6 @@ msgstr ""
 
 #~ msgid "Issues Tracker"
 #~ msgstr "Obsługa problemów"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Kreator tworzenia wiadomości"
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 1f097e77a31..40ade73da66 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Novas tarefas"
 
 #. 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 "Voltar a incluir a descrição da tarefa na tarefa do utilizador"
 
 #. module: project
 #: code:addons/project/project.py:951
@@ -36,28 +36,28 @@ msgstr "A tarefa '%s' foi atribuída a %s."
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"A empresa escolhida não faz parte das possíveis de serem selecionadas para "
-"este utilizador"
+"A empresa escolhida não está entre as permitidas para este utilizador"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Mês anterior"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "As Minhas Tarefas"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "Alertar Terceiro"
+msgstr "Avisar Parceiro"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr "Indicar aqui as horas ainda necessárias para terminar a tarefa"
+msgstr ""
+"Indicar aqui as horas que ainda serão necessárias para terminar a tarefa."
 
 #. module: project
 #: view:project.task:0
@@ -68,7 +68,7 @@ msgstr "Prazos"
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operação Não Permitida !"
+msgstr "Operação não é permitida !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -82,24 +82,24 @@ msgstr "VERIFICAR: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email Utilizador"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Trabalho feito"
+msgstr "Trabalho concluído"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Aviso !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Delegar tarefa"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -109,7 +109,7 @@ msgstr "Horas para Validar"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Projetos pendentes"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -123,12 +123,12 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Re-abrir projeto"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir a lista de projetos"
 
 #. module: project
 #: constraint:project.project:0
@@ -138,12 +138,12 @@ msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Tarefa reavaliação"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr "Membros do Projecto"
+msgstr "Membros do Projeto"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
@@ -153,7 +153,7 @@ msgstr "Tarefas por delegado"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr "março"
+msgstr "Março"
 
 #. module: project
 #: view:project.task:0
@@ -177,7 +177,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "My Tasks"
-msgstr "Minhas tarefas"
+msgstr "As Minhas Tarefas"
 
 #. module: project
 #: constraint:project.task:0
@@ -193,7 +193,7 @@ msgstr "Empresa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Tarefas pendentes"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -203,7 +203,7 @@ msgstr "Título da Sua Tarefa"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nome estágio"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -213,7 +213,7 @@ msgstr "Definir como pendente"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Importante"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -223,22 +223,22 @@ msgstr "Definir as exigências e fixar as horas planeadas."
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Alterar etapa"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Novo Projecto Baseado em um Modelo"
+msgstr "Novo Projeto Baseado num Template"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Erro! Não pode atribuir uma escaltion ao mesmo projeto!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
 msgid "Very urgent"
-msgstr "Muito urgente"
+msgstr "Muito Urgente"
 
 #. module: project
 #: help:project.task.delegate,project_id:0
@@ -249,7 +249,7 @@ msgstr "Utilizador a quem quer entregar esta tarefa"
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Minhas Tarefas"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,day:0
@@ -260,12 +260,12 @@ msgstr "Dia"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projetos e etapas"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr "Definir como Modelo"
+msgstr "Definir como Template"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
@@ -289,7 +289,7 @@ msgstr "Membros"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project.my_open_tasks_action
 msgid "My Open Tasks"
-msgstr "Minhas tarefas abertas"
+msgstr "Minhas Tarefas Abertas"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -297,16 +297,18 @@ msgstr "Minhas tarefas abertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Por favor, especifique o Gestor de Projeto ou o endereço de e-mail de Gestor "
+"de Projeto."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Para cancelar a tarefa"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Trabalho da Tarefa do Projeto"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -316,7 +318,7 @@ msgstr "Notas"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Projeto vs horas restantes"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -331,6 +333,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Este campo é calculado automaticamente e têm o mesmo comportamento que o "
+"campo boolean \"ativo\": se a tarefa está ligada a um template ou projeto "
+"inativo, estará oculto, a menos que especificamente solicitado."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -340,7 +345,7 @@ msgstr "Resumo da Tarefa"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Não é uma tarefa do template"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -357,13 +362,13 @@ msgstr "Tarefa está Concluída"
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
-"Variáveis automáticas para cabeçalhos e rodapés. Use exactamente a mesma "
+"Variáveis automáticas para cabeçalhos e rodapés. Use exatamente a mesma "
 "notação."
 
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas com prazo"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -376,17 +381,17 @@ msgstr "Cancelado"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr "Data de fim"
+msgstr "Data Final"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr "Cabeçalho da Mensagem"
+msgstr "Cabeçalho do Mail"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Mudar para próxima etapa"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -396,7 +401,7 @@ msgstr "Tarefa concluída"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de Cor"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -406,7 +411,7 @@ msgstr "Configuração"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Mês Atual"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -421,7 +426,7 @@ msgstr "Agrupar por..."
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr "Feito por"
+msgstr "Concluído por"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -452,7 +457,7 @@ msgstr "Conta Analítica"
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr "Calculado usando a soma das tarefas realizadas."
+msgstr "Processado com base na soma das tarefas de trabalho concluídas."
 
 #. module: project
 #: view:project.task:0
@@ -468,43 +473,43 @@ msgstr "Prazo Limite"
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Pronto"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Mudar Cor"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr "Erro! Não pode criar contas analíticas recursivamente"
+msgstr "Erro! Não pode criar contas analíticas recursivas."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (cópia)"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Nova tarefa"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr "Número de tarefas"
+msgstr "# de tarefas"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -514,32 +519,32 @@ msgstr "Atribuído a"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Data Stop : %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Não se pode ter dois utilizadores com os mesmos dados de acesso"
+msgstr "Não pode ter dois utilizadores com o mesmo login!"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "Redefinir como Projecto"
+msgstr "Redefinir como Projeto"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr "Modelo"
+msgstr "Template"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
 msgid "My projects"
-msgstr "Meus projectos"
+msgstr "Os Meus projectos"
 
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Não pode criar empresas recursivas."
 
 #. module: project
 #: view:project.task:0
@@ -549,28 +554,28 @@ msgstr "Próximo"
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "A partir do estado \"Rascunho\", vai passar ao estado \"Aberto\"."
+msgstr "A partir do estado Rascunho, vai passar ao estado Aberto."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr "Número de dias"
+msgstr "# de dias"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Abrir projeto"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Deve atribuir os membros em projeto '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Tarefas em progresso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -587,7 +592,7 @@ msgstr "Descrição da Nova Tarefa"
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr "Tarefa do projecto"
+msgstr "Tarefa do projeto"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -595,7 +600,7 @@ msgstr "Tarefa do projecto"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -606,18 +611,18 @@ msgstr "Processado como: Tempo Gasto + Tempo Restante."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flow acumulado"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr "Horas efectivas"
+msgstr "Horas Efetivas"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Título da tarefa de validação"
 
 #. module: project
 #: view:project.task:0
@@ -628,23 +633,23 @@ msgstr "Reavaliar"
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Atraso OverPass"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Medium"
-msgstr "Medio"
+msgstr "Médio"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tarefas pendentes"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -656,19 +661,19 @@ msgstr "Horas Restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data da Criação"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Tempo Restante"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -690,7 +695,7 @@ msgstr "Tarefas não Atribuídas"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Sem tarefas atribuídas a utilizadores"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -698,6 +703,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Soma das horas planeadas de todas as tarefas relacionadas a este projeto e "
+"sub projetos."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -719,7 +726,7 @@ msgstr "Título Delegado"
 #: view:project.task:0 view:project.task.history.cumulative:0
 #: view:report.project.task.user:0
 msgid "My Projects"
-msgstr "Meus Projectos"
+msgstr "Meus Projetos"
 
 #. module: project
 #: view:project.task:0
@@ -729,12 +736,12 @@ msgstr "Informação Extra"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr "julho"
+msgstr "Julho"
 
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Gráfico Burndown de Tarefas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -748,7 +755,7 @@ msgstr "Data Inicial"
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr "Projectos"
+msgstr "Projetos"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -756,7 +763,7 @@ msgstr "Projectos"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Estágio"
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -765,6 +772,9 @@ 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 ""
+"Definir os passos que serão utilizados no projeto desde a criação da tarefa, "
+"até o encerramento da tarefa ou problema. Vai usar essas fases, a fim de "
+"acompanhar o progresso na solução de uma tarefa ou um problema."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -780,7 +790,7 @@ msgstr "Datas"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Novo título da tarefa delegada ao utilizador"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -789,11 +799,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Não pode excluir um projeto contendo tarefas. Eu sugiro que o desative."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projeto vs Planeado e Total Horas"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -803,24 +814,24 @@ msgstr "Rascunho da tarefa em aberto"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr "janeiro"
+msgstr "Janeiro"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr "Horas de demora"
+msgstr "Horas em Atraso"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Muito importante"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Análise de tarefas"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -834,6 +845,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Se verificar neste campo, o gerente de projetos receberá um email cada vez "
+"que uma tarefa seja concluída pela equipa."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -846,50 +859,50 @@ msgstr ""
 #: model:res.request.link,name:project.req_link_project
 #: field:res.users,context_project_id:0 field:task.by.days,project_id:0
 msgid "Project"
-msgstr "Projecto"
+msgstr "Projeto"
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Avaliar"
 
 #. module: project
 #: view:board.board:0
 msgid "My Board"
-msgstr "Meu quadro"
+msgstr "O meu Painel"
 
 #. 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 "Estágios"
+msgstr "Fases"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Muda para a fase anterior"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Gestão de Projectos"
+msgstr "Gestão de Projetos"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
 msgid "Project Time Unit"
-msgstr "Unidade de tempo do projecto"
+msgstr "Unidade de tempo do projeto"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Delegar tarefa do projeto"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -905,12 +918,12 @@ msgstr "Tarefas"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Ascendente"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcar como Bloqueado"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -924,16 +937,24 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"A tarefa representa um trabalho que tem que ser feito. Cada utilizador "
+"trabalha na própria lista de tarefas, onde pode gravar a tarefa em horas. "
+"Pode trabalhar e fechar a tarefa em si ou delegá-la a outro utilizador. Se "
+"delegar uma tarefa para outro utilizador, recebe uma nova tarefa no estado "
+"pendente, que será reaberta quando tem que rever o trabalho realizado. Se "
+"instalar o módulo project_timesheet, o trabalho da tarefa pode ser faturado "
+"com base na configuração do projeto. Com o módulo project_mrp, ordens de "
+"vendas pode criar tarefas automaticamente quando são confirmadas."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr "setembro"
+msgstr "Setembro"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr "dezembro"
+msgstr "Dezembro"
 
 #. module: project
 #: field:project.task,progress:0
@@ -949,6 +970,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Se a tarefa é criada o Estado é 'Rascunho'. \n"
+"  Se a tarefa for iniciada, o Estado torna-se 'em processamento'. \n"
+"  Se é necessário rever a tarefa está em estado 'Pendente'. \n"
+"  Se a tarefa é terminada, os estados são definidos para 'Concluído'."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -964,18 +989,18 @@ msgstr "Mês"
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr "Tarefas do projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Fase Tarefas"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Design"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -988,7 +1013,7 @@ msgstr "Horas Planeadas"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Reveja fase da tarefa"
 
 #. module: project
 #: view:project.project:0
@@ -998,24 +1023,24 @@ msgstr "Estado: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir uma lista de tarefas."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr "Data de início"
+msgstr "Data Inicial"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pronto para puxar"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr "Tarefas \"mãe\""
+msgstr "Tarefas ascendentes"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1023,7 +1048,7 @@ msgstr "Tarefas \"mãe\""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqueado"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1031,11 +1056,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Se a tarefa tem um avanço de 99,99%, deve fechar a tarefa se ela acabou ou "
+"reavaliar o tempo"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Endereço de Contato"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1045,6 +1072,12 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Estado de uma tarefa kanban indica situações especiais que lhe dizem "
+"respeito:\n"
+"  * Normal é a situação padrão\n"
+"  * Bloqueado indica que algo está a impedir o progresso desta tarefa\n"
+"  * Pronto para Pull indica a tarefa está pronta para ser puxada para a "
+"próxima fase"
 
 #. module: project
 #: view:project.project:0
@@ -1054,12 +1087,12 @@ msgstr "Utilizador: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr "Facturação"
+msgstr "Faturação"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para mudar para estado delegado"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1070,7 +1103,7 @@ msgstr "Prioridade"
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Templates do projeto"
 
 #. module: project
 #: view:project.project:0
@@ -1080,13 +1113,13 @@ msgstr "Administração"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "CONFIRA: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1096,12 +1129,12 @@ msgstr "Membro"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Project Tasks"
-msgstr "Tarefas do Projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Tempo estimado para fechar esta tarefa pelo utilizador delegado"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1120,7 +1153,7 @@ msgstr "Baixo"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Estado Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1134,11 +1167,14 @@ 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 ""
+"Este relatório permite analisar o desempenho dos projetos e utilizadores. "
+"Pode analisar a quantidade de tarefas, as horas gastas em comparação com as "
+"horas planeadas, o número médio de dias para abrir ou fechar uma tarefa, etc"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Mudar tipo"
 
 #. module: project
 #: help:project.project,members:0
@@ -1146,44 +1182,46 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Membros do projeto são os utilizadores que podem ter um acesso a tarefas "
+"relacionadas a este projeto."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Gestor do Projecto"
+msgstr "Gestor do Projeto"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Para mudar para o estado concluído"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "Tarefas por utilizador e projecto"
+msgstr "Tarefas por utilizador e projeto"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr "agosto"
+msgstr "Agosto"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
 msgid "Project Name"
-msgstr "Nome do projecto"
+msgstr "Nome do Projeto"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Histórico de tarefas"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1191,49 +1229,51 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Novo estado da própria tarefa. Pendente será reaberto automaticamente quando "
+"a tarefa delegada está fechado"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor, especifique o cliente ou endereço de email do cliente."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr "junho"
+msgstr "Junho"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr "Tempo total"
+msgstr "Tempo Total"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr "Dias até ao fecho"
+msgstr "Dias para Fechar"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Painel de projecto"
+msgstr "Painel do Projeto"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "Reactivar"
+msgstr "Reativar"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilizador"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr "Ativo"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1244,23 +1284,23 @@ msgstr "Dias até a abertura"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembro"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Crie os seus primeiros projetos"
 
 #. module: project
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "O projeto '%s' foi fechado."
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Flow das tarefas acumulado"
 
 #. module: project
 #: view:project.task:0
@@ -1270,12 +1310,12 @@ msgstr "Edições de tarefas"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr "outubro"
+msgstr "Outubro"
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar tempo planeado e tarefa aberta"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1283,16 +1323,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculado como a diferença entre as horas planeadas pelo gestor do projeto e "
+"as horas totais da tarefa."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico das delegações"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1300,6 +1342,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Se o campo ativo é definido como Falso, ele permitirá que oculte o projeto "
+"sem o remover."
 
 #. module: project
 #: view:project.task:0
@@ -1314,12 +1358,12 @@ msgstr "Empresas"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projetos em que sou membro."
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Pesquisar projeto"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1336,7 +1380,7 @@ msgstr "Data"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr "Painel"
+msgstr "Painel de Controlo"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1344,7 +1388,7 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr "Isto define a unidade de medida usada nos projectos e tarefas."
+msgstr "Isto define a unidade de medida usada nos projetos e tarefas."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1356,17 +1400,17 @@ msgstr "Erro"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr "Projectos do utilizador"
+msgstr "Projetos do utilizador"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegar"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Número de dias até abrir tarefa"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1390,23 +1434,23 @@ msgid ""
 "task is in draft state."
 msgstr ""
 "Tempo estimado para executar esta tarefa, normalmente definido pelo gestor "
-"do projecto quando a tarefa encontra-se em  rascunho."
+"do projeto quando a tarefa está no estado rascunho."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Título para a validação da tarefa"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Avançados..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Por favor, excluir o projeto ligado a esta conta primeiro."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1428,7 +1472,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Utilizador delegado deve ser especificado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1448,9 +1492,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"Ligue este projecto a uma conta analítica caso precisar de gestão financeira "
-"nos projectos. Permite-lhe ligar projectos a orçamentos, planeamento, "
-"análise de custos e de receitas, calendário de projectos, etc."
+"Ligue este projeto a uma conta analítica caso precisar de gestão financeira "
+"nos projetos. Permite-lhe ligar projetos a orçamentos, planeamento, análise "
+"de custos e de receitas, calendário de projetos, etc."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -1477,7 +1521,7 @@ msgstr "Cancelar"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1507,7 +1551,7 @@ msgstr "Em Progresso"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Análise das tarefas"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1516,16 +1560,18 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarefa descendente ainda em aberto.\n"
+"Por favor, cancelar ou completar a tarefa descendente primeiro."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Fases comuns a todos os projetos"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
 
 #. module: project
 #: field:project.task.history,user_id:0
@@ -1536,23 +1582,23 @@ msgstr "Responsável"
 #. module: project
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr "Tempo de trabalho"
+msgstr "Tempo de Trabalho"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projetos em que eu sou gestor"
 
 #. module: project
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "A tarefa '%s' está pendente."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projecto vs  horas"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1565,6 +1611,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Soma de horas gastas de todas as tarefas relacionadas a este projeto e sub "
+"projetos."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1585,7 +1633,7 @@ msgstr "Alertar o Gestor"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1605,7 +1653,7 @@ msgstr "Desenvolvimento"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Horas restantes para projeto"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1621,7 +1669,7 @@ msgstr "Urgente"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr "maio"
+msgstr "Maio"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1631,7 +1679,7 @@ msgstr "Validação da Tarefa"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Total de tarefas"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1639,13 +1687,15 @@ msgid ""
 "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."
 msgstr ""
+"Se verificar neste campo, esta fase será proposta por omissão em cada "
+"projeto novo. Não vai atribuir nesta fase, os projetos existentes."
 
 #. 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 "Minhas tarefas delegadas"
 
 #. module: project
 #: view:project.project:0
@@ -1676,12 +1726,12 @@ msgstr "Minhas contas a facturar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Desenvolvimento"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr "Tarefas do projecto"
+msgstr "Tarefas do Projeto"
 
 #. module: project
 #: code:addons/project/project.py:851
@@ -1695,11 +1745,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Somatório do total de horas de todas as tarefas para este projeto e sub "
+"projetos."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Comum a todos os projetos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1717,23 +1769,23 @@ msgstr "Cliente"
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr "fevereiro"
+msgstr "Fevereiro"
 
 #. 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 "Tarefas por Dias"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: project
 #: view:project.task:0
@@ -1753,22 +1805,22 @@ msgstr "Resumo do trabalho"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Mês-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Número de dias para fechar a tarefa"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mês-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr "abril"
+msgstr "Abril"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1788,12 +1840,12 @@ msgstr "Abrir Tarefa Concluída"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comum"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Horas Gastas"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1801,17 +1853,19 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"As fases podem ser comuns a todo o projeto ou específico de um projeto. Cada "
+"tarefa seguirá as diferentes fases, a fim de ser fechada."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Dá a ordem da sequência ao exibir uma lista de projetos."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Tarefa '%s' Fechada"
 
 #. module: project
 #: field:project.task,id:0
@@ -1822,27 +1876,27 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Tabela Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "As tarefas atribuídas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Tarefas superada"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Ano Atual"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Não pode criar membros recursivos."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1854,7 +1908,7 @@ msgstr "Sequência"
 #: 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 "Restantes horas por projeto"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1877,6 +1931,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Um projeto contém um conjunto de tarefas ou questões que serão executadas "
+"pelos recursos atribuídos a ele. Um projeto pode ser hierarquicamente "
+"estruturado, como um sub projeto do projeto principal. Isso permite que "
+"projete estruturas grandes com fases diferentes espalhadas ao longo do ciclo "
+"de duração do projeto. Cada utilizador pode definir o projeto padrão com as "
+"próprias preferências para filtrar automaticamente as tarefas ou as questões "
+"que ele geralmente trabalha. Se escolher faturar o tempo gasto numa tarefa "
+"de projeto, pode encontrar as tarefas do projeto a ser faturado na secção de "
+"faturamento."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1900,6 +1963,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Tempo estimado para que se possa validar o trabalho feito pelo utilizador "
+"para quem se delegado essa tarefa"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1909,25 +1974,25 @@ msgstr "Gestor"
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr "Data de criação"
+msgstr "Data de Criação"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "A tarefa '%s' está cancelada."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para mudar para o estado aberto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
 #: field:project.task,partner_id:0 view:report.project.task.user:0
 #: field:report.project.task.user,partner_id:0
 msgid "Partner"
-msgstr "Terceiro"
+msgstr "Parceiro"
 
 #. module: project
 #: code:addons/project/project.py:804
@@ -1939,7 +2004,7 @@ msgstr "Enviar mensagem após o fecho da tarefa"
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Estágios da tarefa"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1949,12 +2014,12 @@ msgstr "Delegue a sua tarefa ao outro utilizador"
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr "Rodapé do Mensagem"
+msgstr "Mail do Rodapé"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Tarefas em progresso"
 
 #~ msgid "Close Task"
 #~ msgstr "Fechar a Tarefa"
@@ -2053,9 +2118,6 @@ msgstr ""
 #~ msgid "Task invoice"
 #~ msgstr "Factura da tarefa"
 
-#~ msgid "Assigned tasks"
-#~ msgstr "Tarefas atribuidas"
-
 #~ msgid ""
 #~ "Project management module that track multi-level projects, tasks,\n"
 #~ "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
@@ -2085,9 +2147,6 @@ msgstr ""
 #~ msgid "New Task"
 #~ msgstr "Nova tarefa"
 
-#~ msgid "Computed as: Time Spent / Total Time."
-#~ msgstr "Calculado como: Tempo despendido / tempo total"
-
 #~ msgid "Review"
 #~ msgstr "Rever"
 
@@ -2245,11 +2304,6 @@ msgstr ""
 #~ msgid "Create a Task"
 #~ msgstr "Criar uma Tarefa"
 
-#, python-format
-#~ msgid ""
-#~ "You can not delete a project with tasks. I suggest you to deactivate it."
-#~ msgstr "Não pode apagar um projecto com tarefas. Sugiro desactivá-lo."
-
 #~ msgid "Parent Task"
 #~ msgstr "Tarefa Ascendente"
 
@@ -2326,3 +2380,186 @@ msgstr ""
 
 #~ msgid "title"
 #~ msgstr "título"
+
+#~ msgid "Assigned tasks"
+#~ msgstr "Tarefas atribuídas"
+
+#~ msgid "_Send"
+#~ msgstr "_Send"
+
+#~ msgid "Issues Tracker"
+#~ msgstr "Rastreador de questões"
+
+#~ msgid "SCRUM"
+#~ msgstr "SCRUM"
+
+#~ msgid "Projects: Planned Vs Total hours"
+#~ msgstr "Projectos: Planeado Vs Total horas"
+
+#~ msgid "Warn Message"
+#~ msgstr "Mensagem Aviso"
+
+#~ msgid "Project Close Task"
+#~ msgstr "Fechar tarefa do projecto"
+
+#~ msgid ""
+#~ "Helps generate invoices based on time spent on tasks, if activated on the "
+#~ "project."
+#~ msgstr ""
+#~ "Ajuda a gerar facturas com base no tempo gasto em tarefas, se activada no "
+#~ "projecto."
+
+#~ msgid "Configure Your Project Management Application"
+#~ msgstr "Configurar a aplicação de Gerência de Projectos"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mês   "
+
+#~ msgid ""
+#~ "Tracks and helps employees encode and validate timesheets and attendances."
+#~ msgstr ""
+#~ "Faixas e ajuda os funcionários a codificar e validar a folha de horas e "
+#~ "assiduidade."
+
+#~ msgid "Specification"
+#~ msgstr "Especificação"
+
+#~ msgid "Methodologies"
+#~ msgstr "Metodologias"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mês-1    "
+
+#~ msgid ""
+#~ "Various OpenERP applications are available to manage your projects with "
+#~ "different level of control and flexibility."
+#~ msgstr ""
+#~ "Várias aplicações OpenERP estão disponíveis para gerir os projectos com "
+#~ "diferentes níveis de controle e flexibilidade."
+
+#, python-format
+#~ msgid "Please specify the email address of Project Manager."
+#~ msgstr "Por favor, especifique o endereço de email do Gerente do Projecto."
+
+#~ msgid "Computed as: Time Spent / Total Time."
+#~ msgstr "Calculado como: Tempo gasto / tempo total"
+
+#~ msgid "  Year  "
+#~ msgstr "  Ano  "
+
+#~ msgid "Helps accountants manage analytic and crossover budgets."
+#~ msgstr "Ajuda a gerir os contabilistas analíticos e orçamentos cruzados."
+
+#~ msgid "Configure"
+#~ msgstr "Configure"
+
+#~ msgid ""
+#~ "Implements and tracks the concepts and task types defined in the SCRUM "
+#~ "methodology."
+#~ msgstr ""
+#~ "Implementa e acompanha os conceitos e tipos de tarefa definidos na "
+#~ "metodologia SCRUM."
+
+#~ msgid "Customer Email"
+#~ msgstr "E-mail do cliente"
+
+#~ msgid "Warn Manager by Email"
+#~ msgstr "Avisa Gerente por Email"
+
+#~ msgid "Manager Email"
+#~ msgstr "Gerente de E-mail"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Erro! A divisa tem que ser o mesma que a divisa da empresa seleccionada"
+
+#~ msgid "Getting Things Done"
+#~ msgstr "Ter coisas concluídas"
+
+#~ msgid "Warn Customer by Email"
+#~ msgstr "Avisar Cliente por E-mail"
+
+#~ msgid ""
+#~ "Project management module tracks multi-level projects, tasks,\n"
+#~ "work done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+#~ " Dashboard for project members that includes:\n"
+#~ "    * List of my open tasks\n"
+#~ "    * Members list of project\n"
+#~ "    "
+#~ msgstr ""
+#~ "Projecto do módulo da gerência de faixas multi-nível de projectos, tarefas \n"
+#~ "trabalho em tarefas, eso. É capaz de tornar o planeamento, as tarefas de "
+#~ "ordem, eso. \n"
+#~ "  Painel para os membros do projecto, que inclui: \n"
+#~ "     * Lista das minhas tarefas abertas \n"
+#~ "     * Lista de membros do projecto\n"
+#~ "    "
+
+#, python-format
+#~ msgid ""
+#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ msgstr "Não pode apagar um projecto com tarefas. Sugiro que o desactive."
+
+#, python-format
+#~ msgid "Please specify the email address of Customer."
+#~ msgstr "Por favor, especifique o endereço de e-mail do cliente."
+
+#~ msgid "Send Email"
+#~ msgstr "Enviar E-mail"
+
+#~ msgid "Current Activity"
+#~ msgstr "Actividade corrente"
+
+#~ 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 é uma metodologia para organizar eficazmente a si mesmo e suas tarefas. "
+#~ "Este módulo integra totalmente princípio GTD com a gestão OpenERP do "
+#~ "projecto."
+
+#~ msgid "Current"
+#~ msgstr "Actual"
+
+#~ msgid ""
+#~ "Computed as difference of the time estimated by the project manager and the "
+#~ "real time to close the task."
+#~ msgstr ""
+#~ "Calculado como a diferença do tempo estimado pelo gerente de projecto e o "
+#~ "tempo real para fechar a tarefa."
+
+#~ msgid ""
+#~ "Enables long-term projects tracking, including multiple-phase projects and "
+#~ "resource allocation handling."
+#~ msgstr ""
+#~ "Permite a longo prazo de monitorização de projectos, incluindo projectos de "
+#~ "múltipla-fase e manipulação de alocação de recursos."
+
+#~ msgid "Bill Time on Tasks"
+#~ msgstr "Tempo contabilizado em tarefas"
+
+#~ msgid "Project Application Configuration"
+#~ msgstr "Configuração da aplicação do projecto"
+
+#~ msgid "Email Address of Project's Manager"
+#~ msgstr "Endereço de E-mail do Gestor dos Projectos"
+
+#~ msgid "Warn Customer"
+#~ msgstr "Avisar Cliente"
+
+#~ msgid "My Projects: Planned vs Total Hours"
+#~ msgstr "Meus Projectos: Planeado vs Total Horas"
+
+#~ msgid "project.installer"
+#~ msgstr "project.installer"
+
+#~ msgid "Merge"
+#~ msgstr "Fundir"
+
+#~ msgid "Automatically synchronizes project tasks and crm cases."
+#~ msgstr "Sincroniza automaticamente as tarefas do projecto e os casos de crm."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de email"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 370c26587c3..0ef329a5891 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-02-21 05:54+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -298,6 +298,8 @@ msgstr "Minhas Tarefas Abertas"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Favor especificar o Gerente de Projeto ou o endereço de email do Gerente de "
+"Projeto."
 
 #. module: project
 #: view:project.task:0
@@ -569,7 +571,7 @@ msgstr "Projetos Abertos"
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Você precisa associar membros no projeto '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -660,7 +662,7 @@ msgstr "Horas Restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
@@ -798,6 +800,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Você não pode excluir um projeto que contêm tarefas. Eu sugiro a você "
+"desativá-lo."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -843,6 +847,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Se você marcar este campo, o gerente de projeto receberá um email a cada vez "
+"que uma tarefa for completada pelo seu time."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -998,7 +1004,7 @@ msgstr "Estágios de Tarefas"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Desenho"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1317,7 +1323,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Histórico de Delegações"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2535,3 +2541,6 @@ msgstr "Tarefas em Progresso"
 
 #~ msgid "Current Activity"
 #~ msgstr "Atividade Atual"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index 153594cfa6b..c27db5b508f 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,50 +13,50 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Sarcini noi"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr "Reinclude descrierea sarcinii in activitatea utilizatorului"
+msgstr "Reincludei descrierea sarcinii in activitatea utilizatorului"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr "Sarcina '%s' a fost delegată lui %s."
+msgstr "Sarcina '%s' i-a fost delegata lui %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Compania aleasă nu se află printre companiile permise acestui utilizator"
+"Compania aleasa nu se afla printre companiile permise acestui utilizator"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Luna anterioara"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Sarcinile mele"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "Avertizează Partenerul"
+msgstr "Avertizati partenerul"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr "Aici introduceti orele rămase necesare pentru a inchide sarcina."
+msgstr "Aici introduceti orele ramase necesare pentru a inchide sarcina."
 
 #. module: project
 #: view:project.task:0
@@ -67,7 +67,7 @@ msgstr "Termene scadente"
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operațiune nepermisă !"
+msgstr "Operatiune nepermisa !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -76,39 +76,39 @@ msgstr "Operațiune nepermisă !"
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr "VERIFICA: "
+msgstr "VERIFICATI: "
 
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-mail utilizator"
 
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Munca efectuată"
+msgstr "Munca efectuata"
 
 #. module: project
 #: code:addons/project/project.py:358 code:addons/project/project.py:789
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertizare !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr "Delegat Sarcină"
+msgstr "Delegat sarcina"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr "Ore de Validat"
+msgstr "Ore de validat"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Proiecte in asteptare"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -116,30 +116,30 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
-"Timpul total rămas poate fi estimat din nou periodic de către persoana "
-"imputernicită."
+"Timpul total ramas poate fi estimat din nou periodic de catre persoana "
+"imputernicita."
 
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Redeschideti proiectul"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr "Prezintă ordinea secventei atunci cand afisează lista proiectelor"
+msgstr "Prezinta secventa de ordonare atunci cand afiseaza lista proiectelor"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
-"Eroare! data de inceput a proiectului trebuie să fie mai mică decat data de "
+"Eroare! data de inceput a proiectului trebuie sa fie mai mica decat data de "
 "sfarsit a proiectului."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr "Re-evaluare sarcina"
+msgstr "Activitatea de reevaluare"
 
 #. module: project
 #: field:project.project,members:0
@@ -149,7 +149,7 @@ msgstr "Membrii proiectului"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Sarcină după delegat"
+msgstr "Sarcina dupa delegat"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -172,8 +172,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Antetul adăugat la inceputul e-mail-ului pentru mesajul de avertizare trimis "
-"clientului atunci cand o sarcină este inchisă."
+"Antetul adaugat la inceputul email-ului pentru mesajul de avertizare trimis "
+"clientului atunci cand o sarcina este inchisa."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -189,52 +189,52 @@ msgstr "Eroare ! Nu puteti crea sarcini recursive."
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr "Companie"
+msgstr "Compania"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Sarcini in asteptare"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
 msgid "Your Task Title"
-msgstr "Titlul Sarcinii dumneavoastră"
+msgstr "Titlul sarcinii dumneavoastra"
 
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Numele Etapei"
+msgstr "Numele etapei"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "Setează in asteptare"
+msgstr "Setati in asteptare"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Important"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr "Defineste Solicitările si Setează Orele Planificate."
+msgstr "Definiti Solicitarile si Setati Orele Planificate."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr "Schimbă Starea"
+msgstr "Schimbati Etapa"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Proiect Nou bazat pe Sablon"
+msgstr "Proiect nou bazat pe un Sablon"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Eroare! Nu puteti atribui o intensificare aceluiasi proiect!"
+msgstr "Eroare! Nu puteti atribui o avansare aceluiasi proiect!"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -245,7 +245,7 @@ msgstr "Foarte urgent"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr "Utilizatorul căruia doriti să ii delegati această sarcină"
+msgstr "Utilizatorul caruia doriti sa ii delegati aceasta sarcina"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -261,17 +261,17 @@ msgstr "Zi"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Proiecte si Etape"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr "Setat ca Sablon"
+msgstr "Setati ca Sablon"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr "Sarcină ciornă"
+msgstr "Sarcina ciorna"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -279,7 +279,7 @@ msgstr "Sarcină ciornă"
 #: field:project.task.history.cumulative,task_id:0
 #: field:project.task.work,task_id:0 view:report.project.task.user:0
 msgid "Task"
-msgstr "Sarcină"
+msgstr "Sarcina"
 
 #. module: project
 #: view:project.project:0
@@ -298,16 +298,18 @@ msgstr "Sarcinile mele deschise"
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
 msgstr ""
+"Va rugam sa specificati Managerul de Proiect sau adresa de e-mail a "
+"Managerului de Proiect."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "Pentru anularea sarcinii"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr "Sarcină de lucru Proiect"
+msgstr "Sarcina de lucru Proiect"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -317,13 +319,13 @@ msgstr "Note"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr "Proiect vs ore rămase"
+msgstr "Proiect vs ore ramase"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr "Planificare medie - Eficientă"
+msgstr "Planificare medie - Eficienta"
 
 #. module: project
 #: help:project.task,active:0
@@ -333,42 +335,42 @@ msgid ""
 "project, it will be hidden unless specifically asked."
 msgstr ""
 "Acest camp este calculat automat si are acelasi comportament ca si campul "
-"'activ' boolean: dacă sarcina este asociată unui sablon sau proiect "
-"neactivat, va fi ascunsă, cu exceptia cazului in care se cere expres să nu "
-"fie."
+"'activ' boolean: dacă sarcina este asociata unui sablon sau unui proiect "
+"neactivat, ea va fi ascunsa, cu exceptia cazului in care se cere in mod "
+"expres sa nu fie."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr "Rezumat sarcină"
+msgstr "Rezumat sarcina"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr "Nu este o Sarcină Sablon"
+msgstr "Nu este o sarcina sablon"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "Start Task"
-msgstr "Incepe sarcina"
+msgstr "Incepeti Sarcina"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "Sarcina este incheiată"
+msgstr "Sarcina este finalizata"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
-"Variabile automate pentru antete si subsoluri. Foloseste intocmai aceeasi "
+"Variabile automate pentru antete si subsoluri. Folositi intocmai aceeasi "
 "notatie."
 
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Afisati numai sarcinile care au un termen limita"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -376,12 +378,12 @@ msgstr ""
 #: selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Cancelled"
-msgstr "Anulat(ă)"
+msgstr "Anulat(a)"
 
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr "Data de sfârşit"
+msgstr "Data de sfarsit"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -391,17 +393,17 @@ msgstr "Antet e-mail"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Treceti la Etapa Urmatoare"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr "Sarcină efectuată"
+msgstr "Sarcina efectuata"
 
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Index Culori"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -411,22 +413,22 @@ msgstr "Configurare"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Luna curenta"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr "Deleagă sarcini celorlalti utilizatori"
+msgstr "Delegati sarcini celorlalti utilizatori"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr "Grupează după..."
+msgstr "Grupati dupa..."
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr "Efectuat de către"
+msgstr "Efectuat de catre"
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -434,9 +436,9 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
-"Dacă bifati această căsută, utilizatorului ii va apărea un popup atunci cand "
-"inchide o sarcină, care propune un mesaj pe care să il trimită prin e-mail "
-"cleintului."
+"Daca bifati aceasta casuta, utilizatorului ii va apărea un popup atunci cand "
+"inchide o sarcina, care propune un mesaj pe care sa il trimita prin e-mail "
+"clientului."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -447,13 +449,13 @@ msgstr "Testare"
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr "Sarcina '%s' inchisă"
+msgstr "Sarcina '%s' inchisa"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
 #: field:project.project,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Cont analitic"
+msgstr "Cont Analitic"
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -469,22 +471,22 @@ msgstr "Planificare"
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Data scadentă"
+msgstr "Termen limita"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr "_Anulează"
+msgstr "_Anulati"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Pregatit(a)"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Schimbati culoarea"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -500,7 +502,7 @@ msgstr " (copie)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Sarcini noi"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -510,7 +512,7 @@ msgstr "# de sarcini"
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr "Anterior"
+msgstr "Precedent(a)"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
@@ -520,7 +522,7 @@ msgstr "Atribuit lui"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr "Data de sfarsit: %(data)s"
+msgstr "Stop Data: %(data)s"
 
 #. module: project
 #: sql_constraint:res.users:0
@@ -530,12 +532,12 @@ msgstr "Nu pot exista doi utilizatori cu acelasi nume de autentificare !"
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr "Resetează ca Proiect"
+msgstr "Resetati ca Proiect"
 
 #. module: project
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Template"
-msgstr "Șablon"
+msgstr "Sablon"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_project
@@ -550,12 +552,12 @@ msgstr "Eroare! Nu puteti crea companii recursive."
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr "Următorul(următoarea)"
+msgstr "Urmatorul (urmatoarea)"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr "Din starea de ciornă va ajunge in starea deschisă."
+msgstr "Din starea de ciorna, va trece in starea deschisa."
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
@@ -565,18 +567,18 @@ msgstr "# de Zile"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Proiecte Open"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Trebuie sa alocati membri proiectului '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Sarcini în progres"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -588,12 +590,12 @@ msgstr ""
 #: view:project.task.delegate:0
 #: field:project.task.delegate,new_task_description:0
 msgid "New Task Description"
-msgstr "Descrierea Noii Sarcini"
+msgstr "Descrierea noii sarcini"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr "Sarcină Proiect"
+msgstr "Sarcină proiect"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -601,18 +603,18 @@ msgstr "Sarcină Proiect"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr "Calculat in felul următor: Timp petrecut + Timp rămas"
+msgstr "Calculat în felul următor: Timp petrecut + Timp rămas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Flux Cumulativ"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -623,23 +625,23 @@ msgstr "Ore efective"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr "Titlul validării sarcinii"
+msgstr "Titlul Validarii Sarcinii"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr "Reevaluează"
+msgstr "Reevaluati"
 
 #. module: project
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr "Trece peste intarziere"
+msgstr "Treceti peste intarziere"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -650,7 +652,7 @@ msgstr "Mediu"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Sarcini in asteptare"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -658,23 +660,23 @@ msgstr ""
 #: field:project.vs.hours,remaining_hours:0 view:report.project.task.user:0
 #: field:report.project.task.user,remaining_hours:0
 msgid "Remaining Hours"
-msgstr "Ore rămase"
+msgstr "Ore ramase"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data crearii"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Ore ramase"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -686,17 +688,17 @@ msgstr "Timp planificat"
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr "Informații"
+msgstr "Informatii"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "Sarcini nealocate"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr "Sarcini neatribuite utilizatorilor"
+msgstr "Sarcini nealocate utilizatorilor"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -716,7 +718,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 "În așteptare"
+msgstr "In asteptare"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -732,7 +734,7 @@ msgstr "Proiectele mele"
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "Informaţii suplimentare"
+msgstr "Informatii suplimentare"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -742,12 +744,12 @@ msgstr "Iulie"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Grafic de sarcini descendent"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
 msgid "Starting Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project
 #: code:addons/project/project.py:324
@@ -764,7 +766,7 @@ msgstr "Proiecte"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr "Etapă"
+msgstr "Etapa"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -773,7 +775,7 @@ 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 ""
-"Defineste pasii care vor folositi in formularul proiectului, de la crearea "
+"Definiti pasii care vor folositi in formularul proiectului, de la crearea "
 "sarcinii pana la inchiderea sarcinii sau problemei. Veti folosi aceste etape "
 "pentru a tine evidenta progresului in rezolvarea unei sarcini sau a unei "
 "probleme."
@@ -782,7 +784,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr "Sarcina '%s' este deschisă."
+msgstr "Sarcina '%s' este deschisa."
 
 #. module: project
 #: view:project.task:0
@@ -801,6 +803,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Nu puteti sterge un proiect care contine sarcini. Va sugeram sa il "
+"dezactivati."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -810,7 +814,7 @@ msgstr "Proiectul vs Ore Planificate si Totale"
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr "Sarcină ciornă deschisă"
+msgstr "Sarcina ciorna deschisa"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -825,7 +829,7 @@ msgstr "Ore intarziere"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Foarte important"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -846,6 +850,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Daca bifati acest camp, managerul de proiect va primi un e-mail ori de cate "
+"ori o sarcina este completata de catre echipa sa."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -863,7 +869,7 @@ msgstr "Proiect"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr "_Evaluează"
+msgstr "_Evaluati"
 
 #. module: project
 #: view:board.board:0
@@ -879,13 +885,13 @@ msgstr "Etape"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Treceti la Etapa Anterioara"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Managementul proiectelor"
+msgstr "Managementul proiectului"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -895,13 +901,13 @@ msgstr "Unitate de timp Proiect"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "In desfasurare"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr "Delegat Sarcină Proiect"
+msgstr "Delegat Sarcina Proiect"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -917,12 +923,12 @@ msgstr "Sarcini"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr "Părinte"
+msgstr "Parinte"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marcati drept Blocat"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -936,15 +942,15 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
-"O sarcină reprezintă o activitate care trebuie efectuată. Fiecare utilizator "
-"lucrează la propria listă de sarcini, unde isi poate inregistra sarcina de "
-"lucru in ore. El poate să lucreze si să inchidă sarcina el insusi sau o "
-"poate delega altui utilizator. Dacă delegati o sarcină unui alt utilizator, "
-"primiti o altă sarcină in stare de asteptare, care va fi redeschisă atunci "
-"cand trebuie verificati munca efectuată. Dacă instalati modulul "
-"project_timesheet (foaie_de_pontaj_proiect), sarcina de lucru poate fi "
-"facturată pe baza configurării proiectului. Cu modulul project_mrp "
-"(proiect_mrp), comenzile de vanzări pot crea automat sarcini atunci cand "
+"O sarcina reprezinta o activitate care trebuie efectuata. Fiecare utilizator "
+"lucreaza la propria lista de sarcini, unde isi poate inregistra sarcina de "
+"lucru in ore. El poate sa lucreze si sa inchidă sarcina el insusi sau o "
+"poate delega altui utilizator. Dacă delegati o sarcina unui alt utilizator, "
+"primiti o alta sarcina in stare de asteptare, care va fi redeschisa atunci "
+"cand trebuie sa verificati munca efectuata. Daca instalati modulul "
+"project_timesheet (fisa_de_pontaj_proiect), sarcina de lucru poate fi "
+"facturata pe baza configurarii proiectului. Cu modulul project_mrp "
+"(proiect_mrp), comenzile de vanzari pot crea automat sarcini atunci cand "
 "sunt confirmate."
 
 #. module: project
@@ -971,15 +977,16 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
-"Dacă sarcina este creată, starea este 'Ciornă'.\n"
-" Dacă sarncina este incepută, starea devine 'In desfăsurare'.\n"
-" Dacă sarcina este verificată, sarcina este in starea 'In asteptare'.\n"
-" Dacă sarcina este incheiată, starea este 'Efectuat'."
+"Daca sarcina este creata, starea este 'Ciorna'.\n"
+" Daca sarcina este inceputa, starea devine 'In desfasurare'.\n"
+" Daca sarcina este verificata, sarcina este in starea 'In asteptare'.        "
+"                          \n"
+" Daca sarcina este incheiata, starea este 'Efectuat'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr "Reevaluează Sarcina"
+msgstr "Reevaluati Sarcina"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -1001,7 +1008,7 @@ msgstr "Etapa sarcinii"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Proiectare"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1014,7 +1021,7 @@ msgstr "Ore planificate"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Verificati Etapele Sarcinii"
 
 #. module: project
 #: view:project.project:0
@@ -1024,19 +1031,19 @@ msgstr "Stare: %(stare)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista de sarcini."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr "Data de început"
+msgstr "Data de inceput"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pregatit(a) de avansare"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1049,7 +1056,7 @@ msgstr "Sarcini principale"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blocat(a)"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1057,11 +1064,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Daca sarcina are un progres de 99.99%, ar trebui sa o inchideti daca este "
+"finalizata sau sa reevaluati timpul"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Adresa de contact"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1071,6 +1080,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Starea kanban a unei sarcini indica situatiile speciale care o afecteaza:\n"
+" * Normal este situatia predefinita\n"
+" * Blocat indica faptul ca ceva impiedica avansarea acestei sarcini\n"
+" * Pregatit(a) de avansare indica faptul ca sarcina este gata sa treaca la "
+"etapa urmatoare"
 
 #. module: project
 #: view:project.project:0
@@ -1085,7 +1099,7 @@ msgstr "Facturare"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Pentru trecerea la starea 'delegat'"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1106,13 +1120,13 @@ msgstr "Administrare"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr "project.task.reevaluate (reevaluare.sarcină.proiect)"
+msgstr "reevaluare.sarcina.proiect"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "VERIFICATI: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1128,7 +1142,7 @@ msgstr "Sarcini Proiect"
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
-"Timpul estimat pentru inchiderea acestei sarcini de către utilizatorul "
+"Timpul estimat pentru inchiderea acestei sarcini de catre utilizatorul "
 "delegat"
 
 #. module: project
@@ -1136,24 +1150,24 @@ msgstr ""
 #: view:project.task:0 selection:project.vs.hours,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "Draft"
-msgstr "Ciornă"
+msgstr "Ciorna"
 
 #. module: project
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Low"
-msgstr "Scăzut(ă)"
+msgstr "Scazut(a)"
 
 #. module: project
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Starea Kanban"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr "Performanţă"
+msgstr "Performanta"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1162,15 +1176,15 @@ 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 ""
-"Acest raport vă permite să analizati performanta proiectelor si a "
-"utilizatorilor dumneavoastră. Puteti analiza cantitatea sarcinilor, orele "
-"petrecute comparate cu orele planificate, numărul mediu de zile pentru "
+"Acest raport va permite sa analizati performanta proiectelor si a "
+"utilizatorilor dumneavoastra. Puteti analiza cantitatea sarcinilor, orele "
+"petrecute comparate cu orele planificate, numarul mediu de zile pentru "
 "deschiderea sau inchiderea unei sarcini, etc."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Schimbati Tipul"
 
 #. module: project
 #: help:project.project,members:0
@@ -1184,17 +1198,17 @@ msgstr ""
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
 msgid "Project Manager"
-msgstr "Manager de proiect"
+msgstr "Managerul de proiect"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "Pentru schimbarea in starea efectuat"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr "Sarcini după utilizator si proiect"
+msgstr "Sarcini dupa utilizator si proiect"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1206,7 +1220,7 @@ msgstr "August"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Obisnuit"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1217,7 +1231,7 @@ msgstr "Numele proiectului"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Istoricul Sarcinilor"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1225,14 +1239,14 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
-"Starea nouă a propriei dumneavoastră sarcini. Sarcina 'In asteptare' va fi "
-"redeschisă automat atunci cand sarcina delegată este inchisă"
+"Starea noua a propriei dumneavoastra sarcini. Sarcina 'In asteptare' va fi "
+"redeschisa automat atunci cand sarcina delegata este inchisa"
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Va rugam sa specificati Clientul sau adresa de e-mail a Clientului"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1259,17 +1273,17 @@ msgstr "Tablou de bord Proiect"
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr "Reactivează"
+msgstr "Reactivati"
 
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Utilizator"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Activ(ă)"
+msgstr "Activ(a)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1285,7 +1299,7 @@ msgstr "Noiembrie"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Creati Primele d-voastra Proiecte"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1296,12 +1310,12 @@ msgstr "Proiectul '%s' a fost inchis."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Fluxul cumulativ al sarcinilor"
 
 #. module: project
 #: view:project.task:0
 msgid "Task edition"
-msgstr "Editare sarcină"
+msgstr "Editare sarcina"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1311,7 +1325,7 @@ msgstr "Octombrie"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validati timpul planificat si deschideti sarcina"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1319,16 +1333,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Calculat drept diferenta dintre orele planificate de catre managerul de "
+"proiect si orele totale ale sarcinii."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Istoric Delegatii"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr "res.users (res.utilizatori)"
+msgstr "res.utilizatori"
 
 #. module: project
 #: help:project.project,active:0
@@ -1336,8 +1352,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
-"Dacă campul activ este setat pe Fals, vă va permite să ascundeti proiectul "
-"fără să il stergeti."
+"Daca campul activ este setat pe Fals, va va permite sa ascundeti proiectul "
+"fara sa il stergeti."
 
 #. module: project
 #: view:project.task:0
@@ -1352,12 +1368,12 @@ msgstr "Companii"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Proeicte la care sunt membru."
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr "Caută Proiect"
+msgstr "Cautati Proiectul"
 
 #. module: project
 #: code:addons/project/project.py:251
@@ -1383,10 +1399,10 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"Acesta va seta unitatea de măsură folosită in proiecte si sarcini.\n"
-"Dacă folositi foaia de pontaj asociată proiectelor (modulul foaie de "
-"pontaj_proiect), nu uitati să setati unitatea de măsură corectă la angajatii "
-"dumneavoastră."
+"Acesta va seta unitatea de masura folosita in proiecte si sarcini.\n"
+"Daca folositi fisa de pontaj asociata proiectelor (modulul fisa de "
+"pontaj_proiect), nu uitati sa setati unitatea de masura corecta la angajatii "
+"dumneavoastra."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
@@ -1403,12 +1419,12 @@ msgstr "Proiectele utilizatorului"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr "_Delegat"
+msgstr "_Delegati"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr "Numărul de zile pentru Deschiderea sarcinii"
+msgstr "Numarul de zile pentru Deschiderea sarcinii"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1431,24 +1447,24 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
-"Timpul estimat pentru efectuarea sarcinii, de obicei setat de către "
-"managerul de proiect atunci cand sarcina se află in starea de ciornă."
+"Timpul estimat pentru efectuarea sarcinii, de obicei setat de catre "
+"managerul de proiect atunci cand sarcina se afla in starea de ciorna."
 
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr "Titlu pentru validarea sarcinii dumneavoastră"
+msgstr "Titlu pentru validarea sarcinii dumneavoastra"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr "Filtre extinse..."
+msgstr "Filtre Extinse..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Va rugam mai intai sa stergeti proiectul asociat acestui cont."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1470,13 +1486,13 @@ msgstr "Stare"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Ar trebui specificat Utilizatorul Delegat"
 
 #. module: project
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr "Sarcina '%s' setată in curs de desfăsurare"
+msgstr "Sarcina '%s' setata in curs de desfasurare"
 
 #. module: project
 #: view:project.project:0
@@ -1490,9 +1506,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
-"Asociază acest proiect unui cont analitic dacă aveti nevoie de gestionarea "
-"financiară a proiectelor. Vă permite să conectati proiecte cu bugete, "
-"planificare, analiza costurilor si a veniturilor, foi de pontaj ale "
+"Asociati acest proiect unui cont analitic daca aveti nevoie de gestionarea "
+"financiara a proiectelor. Va permite sa conectati proiecte cu bugete, "
+"planificare, analiza costurilor si a veniturilor, fise de pontaj ale "
 "proiectelor, etc."
 
 #. module: project
@@ -1515,28 +1531,28 @@ msgstr "An"
 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0
 #: view:project.project:0 view:project.task:0
 msgid "Cancel"
-msgstr "Anulează"
+msgstr "Anulati"
 
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr "Închide"
+msgstr "Inchideti"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr "Deschide sarcina"
+msgstr "Deschideti sarcina"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr "Deschide"
+msgstr "Deschideti"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr "ID: %(id_sarcină)s"
+msgstr "ID: %(id_sarcina)s"
 
 #. module: project
 #: view:project.task:0 selection:project.task,state:0
@@ -1545,12 +1561,12 @@ msgstr "ID: %(id_sarcină)s"
 #: selection:project.task.history.cumulative,state:0
 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0
 msgid "In Progress"
-msgstr "În desfăsurare"
+msgstr "In curs de desfasurare"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Analiza sarcinii"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1559,17 +1575,19 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Sarcina secundara e inca deschisa.\n"
+"Va rugam sa anulati sau sa finalizati sarcina secundara mai intai."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etape comune tuturor proiectelor"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie să fie mai mare decat data de "
+"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
 "inceput"
 
 #. module: project
@@ -1581,12 +1599,12 @@ msgstr "Responsabil"
 #. module: project
 #: field:project.project,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Program de lucru"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Proiecte la care sunt manager"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1602,7 +1620,7 @@ msgstr " Proiect vs ore"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Delegated Task"
-msgstr "Sarcină delegată"
+msgstr "Sarcina delegata"
 
 #. module: project
 #: help:project.project,effective_hours:0
@@ -1617,22 +1635,22 @@ msgstr ""
 #: selection:project.task,priority:0
 #: selection:report.project.task.user,priority:0
 msgid "Very Low"
-msgstr "Foarte scăzut(ă)"
+msgstr "Foarte scazut(a)"
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Programul orelor lucrate pentru a regla raportul diagramei Gantt"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr "Avertizează Managerul"
+msgstr "Avertizati Managerul"
 
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr "Termen limită depăsit"
+msgstr "Termen limita depasit"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
@@ -1642,7 +1660,7 @@ msgstr "Termenele limita pentru sarcinile mele"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr "Re-evaluează Sarcina"
+msgstr "Re-evaluati Sarcina"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1652,7 +1670,7 @@ msgstr "Dezvoltare"
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr "Orele mele rămase după Proiect"
+msgstr "Orele mele ramase dupa Proiect"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1673,7 +1691,7 @@ msgstr "Mai"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task"
-msgstr "Validare Sarcină"
+msgstr "Validare Sarcina"
 
 #. module: project
 #: field:task.by.days,total_task:0
@@ -1686,6 +1704,8 @@ msgid ""
 "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."
 msgstr ""
+"Daca bifati acest camp, aceasta etapa va fi propusa implicit la fiecare "
+"proiect nou. Aceasta etapa nu va fi atribuita proiectelor existente."
 
 #. module: project
 #: view:board.board:0
@@ -1697,7 +1717,7 @@ msgstr "Sarcinile mele delegate"
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "Sarcină: %(nume)s"
+msgstr "Sarcina: %(nume)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1708,7 +1728,7 @@ msgstr "Atribuiti lui"
 #: field:project.project,progress_rate:0 view:report.project.task.user:0
 #: field:report.project.task.user,progress:0
 msgid "Progress"
-msgstr "Progres"
+msgstr "In desfasurare"
 
 #. module: project
 #: field:project.project,effective_hours:0 field:project.task.work,hours:0
@@ -1723,7 +1743,7 @@ msgstr "Conturile mele de facturat"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Desfasurare"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1734,7 +1754,7 @@ msgstr "Sarcini proiect"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr "Sarcina '%s' este efectuată."
+msgstr "Sarcina '%s' este efectuata."
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1748,12 +1768,12 @@ msgstr ""
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Comun(a) tuturor Proiectelor"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr "Atunci cand sarcina este incheiată, starea va fi 'efectuat'."
+msgstr "Atunci cand sarcina este finalizata, starea va fi 'efectuat'."
 
 #. module: project
 #: view:project.project:0
@@ -1765,7 +1785,7 @@ msgstr "Client"
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr "Data de sfârșit"
+msgstr "Data de sfarsit"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1776,42 +1796,42 @@ msgstr "Februarie"
 #: 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 "Sarcina după Zile"
+msgstr "Sarcina dupa Zile"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Numele companiei trebuie sa fie unic !"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr "Editează"
+msgstr "Editati"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr "Inregistrează orele dumneavoastră de lucru."
+msgstr "Inregistrati-va orele de lucru."
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr "Rezumat muncă"
+msgstr "Rezumat munca"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Luna-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr "Număr de zile pentru inchiderea sarcinii"
+msgstr "Numarul  de zile pana la inchiderea sarcinii"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Luna-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1831,12 +1851,12 @@ msgstr "Diverse"
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr "Deschide Sarcina Efectuată"
+msgstr "Deschideti Sarcina Efectuata"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Comun"
 
 #. module: project
 #: view:project.task:0
@@ -1849,17 +1869,19 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapele pot fi comune tuturor proiectelor sau specifice unui proiect. "
+"Fiecare sarcina va urma diferitele etape pentru a putea fi inchise."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr "Prezintă ordinea secventei atunci cand afisează o listă cu Proiecte."
+msgstr "Prezinta ordinea secventei atunci cand afiseaza o lista cu Proiecte."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr "Sarcina '%s' inchisă"
+msgstr "Sarcina '%s' inchisa"
 
 #. module: project
 #: field:project.task,id:0
@@ -1870,12 +1892,12 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Grafic descendent"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Sarcini Alocate"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
@@ -1885,24 +1907,24 @@ msgstr "Sarcini omise"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Anul curent"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Eroare ! Nu puteti crea membri asociati recursiv."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
 #: field:project.task,sequence:0 field:project.task.type,sequence:0
 msgid "Sequence"
-msgstr "Secvență"
+msgstr "Secventa"
 
 #. 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 "Orele rămase per Proiect"
+msgstr "Orele ramase per Proiect"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1910,8 +1932,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"Subsol adăugat la inceputul e-mail-ului cu mesajul de avertizare trimis "
-"clientului atunci cand o sarcină este inchisă."
+"Subsol adaugat la inceputul e-mail-ului cu mesajul de avertizare trimis "
+"clientului atunci cand o sarcina este inchisa."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1926,30 +1948,30 @@ msgid ""
 "be invoiced in the billing section."
 msgstr ""
 "Un proiect contine un set de sarcini sau probleme care vor fi efectuate de "
-"către resursele atribuite. Un proiect poate fi structurat ierarhic, ca fiind "
-"subordonat unui Proiect Principal (Părinte). Astfel dumneavoastră puteti "
-"proiecta structuri mari de proiect cu diferite etape răspandite pe ciclul "
+"catre resursele atribuite. Un proiect poate fi structurat ierarhic, ca fiind "
+"subordonat unui Proiect Principal (Parinte). Astfel dumneavoastra puteti "
+"proiecta structuri mari de proiect cu diferite etape raspandite pe ciclul "
 "duratei proiectului. Fiecare utilizator isi poate seta proiectul implicit in "
 "propriile preferinte pentru a filtra automat sarcinile sau problemele la "
-"care lucrează de obicei. Dacă alegeti să facturati timpul petrecut cu o "
-"sarcină a proiectului, puteti găsi facturarea sarcinilor proiectului in "
+"care lucreaza de obicei. Daca alegeti sa facturati timpul petrecut cu o "
+"sarcina a proiectului, puteti gasi facturarea sarcinilor proiectului in "
 "sectiunea facturare."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
 msgid "Task Work"
-msgstr "Sarcină de lucru"
+msgstr "Sarcina de lucru"
 
 #. module: project
 #: field:project.task.delegate,state:0
 msgid "Validation State"
-msgstr "Starea Validării"
+msgstr "Starea Validarii"
 
 #. module: project
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr "Sarcina '%s' a fost anulată."
+msgstr "Sarcina '%s' a fost anulata."
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1957,8 +1979,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
-"Timpul estimat pentru validarea de către dumneavoastră a muncii efectuate de "
-"către utilizatorul căruia i-ati delegat această sarcină."
+"Timpul estimat pentru validarea de catre dumneavoastra a muncii efectuate de "
+"catre utilizatorul caruia i-ati delegat aceasta sarcina."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
@@ -1968,18 +1990,18 @@ msgstr "Manager"
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr "Creează data"
+msgstr "Creati Data"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr "Sarcina '%s' este anulată."
+msgstr "Sarcina '%s' este anulata."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Pentru schimbarea in starea 'deschis'"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1992,7 +2014,7 @@ msgstr "Partener"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr "Trimite e-mail după inchiderea sarcinii"
+msgstr "Trimite e-mail dupa inchiderea sarcinii"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
@@ -2003,7 +2025,7 @@ msgstr "Etapele Sarcinilor"
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr "Deleagă sarcina dumneavoastră unui alt utilizator"
+msgstr "Delegati-va sarcina altor utilizatori"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
@@ -2013,7 +2035,7 @@ msgstr "Subsol e-mail"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Sarcini in desfasurare"
 
 #~ msgid "Assigned tasks"
 #~ msgstr "Sarcini atribuite"
@@ -2261,3 +2283,6 @@ msgstr ""
 
 #~ msgid "Budgets"
 #~ msgstr "Bugete"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistent compunere e-mail"
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 6303a4ee635..e67cfb00200 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-09 05:38+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -331,6 +331,9 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Это поле вычислено автоматически и имеет примерно тоже значение, что и "
+"булевое поле \"Активный\": если задача имеет ссылку на шаблон или не "
+"активированный проект, оно будет скрыто, если не вызвано специально"
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
@@ -340,7 +343,7 @@ msgstr "Описание задания"
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Не шаблон задания"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -474,7 +477,7 @@ msgstr "Отмена"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr "Готов"
+msgstr "Готово"
 
 #. module: project
 #: view:project.task:0
@@ -596,7 +599,7 @@ msgstr "Задание проекта"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr "Создать"
+msgstr "Новые"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -607,7 +610,7 @@ msgstr "Вычисляется по формуле: Затраченное вр
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Совокупный поток"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -634,7 +637,7 @@ msgstr "%s (копия)"
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Задержка завершения"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -657,8 +660,8 @@ msgstr "Оставшееся время"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Мастер создания электронной почты"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -737,7 +740,7 @@ msgstr "Июль"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Ниспадающая диаграмма задач"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -768,6 +771,9 @@ 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 ""
+"Определите шаги, которые будут использованы в проекте от создания до "
+"закрытия задачи или проблемы. Вы будете использовать эти шаги для "
+"отслеживания прогресса в разрешении задач."
 
 #. module: project
 #: code:addons/project/project.py:903
@@ -783,7 +789,7 @@ msgstr "Даты"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Новый заголовок порученной задачи"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -792,11 +798,12 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Вы не можете удалить проект, содержащий задачи. Лучше  его остановить."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Проект по запланированным и всем часам"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -806,7 +813,7 @@ msgstr "Открыть черновик задания"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -823,7 +830,7 @@ msgstr "Очень важно"
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Анализ задач"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -856,7 +863,7 @@ msgstr "Проект"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Оценить"
 
 #. module: project
 #: view:board.board:0
@@ -872,7 +879,7 @@ msgstr "Стадии"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Вернуться на предыдущий шаг"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -894,7 +901,7 @@ msgstr "Выполняется"
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Назначить задание"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -910,7 +917,7 @@ msgstr "Задания"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Материнский"
 
 #. module: project
 #: view:project.task:0
@@ -943,17 +950,17 @@ msgstr ""
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr "Выполнение (%)"
+msgstr "Выполнено (%)"
 
 #. module: project
 #: help:project.task,state:0
@@ -964,6 +971,10 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Созданная задача имеет статус \"Черновик\".\n"
+" Если задача начата, присваивается статус \"В работе\".\n"
+" Если необходим контроль, присваивается статус \"В ожидании\".\n"
+" Если задание завершено, устанавливается статус \"Выполнено\"."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -990,7 +1001,7 @@ msgstr "Стадия Задачи"
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Проектирование"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -1013,24 +1024,24 @@ msgstr "Статус: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Позволяет отображать задания в списке задач последовательно."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Начальная дата"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Готово к переходу"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Родительские задания"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1038,7 +1049,7 @@ msgstr ""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Блокировано"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1062,6 +1073,10 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"Канбан имеент собственные статусы задач, обозначающие специальные ситуации:\n"
+" * \"В норме\" - ситуация по умолчанию.\n"
+" * \"Блокировано\" - что-то препятствует выполнению данной задачи.\n"
+" * \"Готово к переходу\" - задание готово к переходу на следующую стадию."
 
 #. module: project
 #: view:project.project:0
@@ -1071,12 +1086,12 @@ msgstr "Польователь: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Счета"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Для смены до назначенного статуса"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1108,7 +1123,7 @@ msgstr "ПРОВЕРЬ: %s"
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr "Участник"
+msgstr "Мои"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1139,12 +1154,12 @@ msgstr "Низкий"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Канбан статус"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Быстродействие"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1153,6 +1168,10 @@ 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 ""
+"Этот отчет позволяет вам анализировать производительность ваших проектов и "
+"пользователей. Вы можете анализировать количество задач, затраченное время "
+"по сравнению с планируемым, среднее число дней для того чтобы открыть или "
+"закрыть задачу."
 
 #. module: project
 #: view:project.task:0
@@ -1186,14 +1205,14 @@ msgstr "Задачи по пользователю и проекту"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "В норме"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1212,6 +1231,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Новый статус вашего задания. Задание будет открыто автоматически, когда "
+"назначенное задание будет выполнено."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
@@ -1222,7 +1243,7 @@ msgstr "Пожалуйста укажите Заказчика или email ад
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1239,7 +1260,7 @@ msgstr "Дней до закрытия"
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Панель Проекта"
+msgstr "Мои проекты"
 
 #. module: project
 #: view:project.task:0
@@ -1249,7 +1270,7 @@ msgstr "Возобновить"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: project
 #: field:project.project,active:0
@@ -1265,7 +1286,7 @@ msgstr "Дней до открытия"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
@@ -1281,7 +1302,7 @@ msgstr "Проект %s только что был закрыт."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Совокупный поток"
 
 #. module: project
 #: view:project.task:0
@@ -1291,7 +1312,7 @@ msgstr "Редакция задания"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: project
 #: view:project.task:0
@@ -1304,6 +1325,8 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Вычисляется как разность между запланированными менеджером проекта часами и "
+"общими часами заданий."
 
 #. module: project
 #: view:project.task:0
@@ -1327,12 +1350,12 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Исполнитель"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Организации"
 
 #. module: project
 #: view:project.project:0
@@ -1359,7 +1382,7 @@ msgstr "Дата"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Инфо-панель"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1387,7 +1410,7 @@ msgstr "Проекты пользователя"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Назначить"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1402,12 +1425,12 @@ msgstr "Поручено"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Журнал"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
 msgid "Assigned to"
-msgstr "Назначено на"
+msgstr "Исполнитель"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -1422,7 +1445,7 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Заголовок вашего проверочного задания"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1493,7 +1516,7 @@ msgstr "Выполнено"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1505,7 +1528,7 @@ msgstr "Отменить"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1516,7 +1539,7 @@ msgstr "Открыть задание"
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 #: view:project.project:0 selection:project.vs.hours,state:0
 msgid "Open"
-msgstr "Открыть"
+msgstr "Открытые"
 
 #. module: project
 #: view:project.project:0
@@ -1535,7 +1558,7 @@ msgstr "В работе"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Анализ заданий"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1544,6 +1567,8 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Подопечное задание по прежнему открыто.\n"
+"Сначала завершите или отмените его."
 
 #. module: project
 #: view:project.task.type:0
@@ -1576,12 +1601,12 @@ msgstr "Проекты, в которых я менеджер"
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Задание '%s' в ожидании."
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Проект по часам"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1616,27 +1641,27 @@ msgstr "Предупредить руководителя"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Просрочено"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr ""
+msgstr "Сроки моих заданий"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Пересмотреть задачу"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Разработка"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr "Мои оставшиеся часы по проекту"
+msgstr "Оставшиеся часы по проектам"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1652,7 +1677,7 @@ msgstr "Срочно"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1710,7 +1735,7 @@ msgstr "Мои счета для выставления"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Развертывание"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1728,12 +1753,12 @@ msgstr "Задание '%s' выполнено"
 msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
-msgstr ""
+msgstr "Сумма часов всех заданий и дочерних проектов данного проекта."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Общее для всех проектов"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1743,35 +1768,35 @@ msgstr "После завершения задания установить дл
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Заказчик"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. 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 "Задания по дням"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1786,22 +1811,22 @@ msgstr "Обзор работы"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Месяц-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Количество дней для завершения задания"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1811,7 +1836,7 @@ msgstr "Затраченное время"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Разное"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1821,12 +1846,12 @@ msgstr "Открыть выполненные задания"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Общие"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Затраченные часы"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1834,48 +1859,51 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Шаги могут быть общими для всех проектов или специфичными для определенного "
+"проекта. Каждое задание пройдет различные стадии для того что бы быть "
+"завершенным."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Позволяет отображать упорядоченный список проектов."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+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
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Ниспадающая диаграмма"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Назначенные задания"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Просроченные задания"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Текущий год"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1887,7 +1915,7 @@ msgstr "Последовательность"
 #: 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 "Оставшееся время на каждый проект"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1910,6 +1938,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Проект содержит список задач и проблем, которые будут выполнены вашими "
+"сотрудниками, назначенными на них. Проект может быть иерархически "
+"структурирован как дочерний проект от основного (материнского) проекта. Это "
+"позволяет вам создавать большие структуры проекта с различными фазами "
+"распространяющимися на всю длительность проекта. Каждый пользователь может "
+"установить себе основной проект в параметрах, для автоматической фильтрации "
+"задач и проблем, над которыми он работает в данный момент. Если вы выберете "
+"оплату времени, ушедшего на проект, вы сможете найти задачи, которые "
+"необходимо оплатить в секции счетов."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1933,27 +1970,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Время, оставшееся вам для проверки законченной работы пользователем, "
+"которому вы назначали задание."
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Руководитель"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Задание '%s' отменено"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Для открытия статуса"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1966,13 +2005,13 @@ msgstr "Партнер"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Отправить e-mail после закрытия задания"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Шаги задания"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1987,7 +2026,7 @@ msgstr "Нижняя часть письма"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Задания в работе"
 
 #~ msgid "Assigned tasks"
 #~ msgstr "Назначенные задания"
@@ -2347,3 +2386,6 @@ msgstr ""
 
 #~ msgid "project.installer"
 #~ msgstr "project.installer"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 08dd4258037..ac59dd0875b 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index 7263162a556..e25f1b73ca6 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr "Preostale ure"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 456e9efaf45..6f5933bd00a 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-02-09 05:56+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:35+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index 3ed7728c4ff..dc540ba196c 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,39 +13,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "Nya aktiviteter"
 
 #. 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 "Återinföra beskrivningen av aktiviteten i arbetet för användaren"
 
 #. module: project
 #: code:addons/project/project.py:951
 #, python-format
 msgid "The task '%s' has been delegated to %s."
-msgstr ""
+msgstr "Aktiviteten '%s' har delegerats till %s."
 
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Detta bolag är inte tillåtet för den här användaren"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Previous Month"
-msgstr ""
+msgstr "Föregående månad"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My tasks"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -55,18 +55,18 @@ msgstr "Varna företag"
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Ange kvarvarande timmar som krävs för att avsluta aktiviteten"
 
 #. module: project
 #: view:project.task:0
 msgid "Deadlines"
-msgstr ""
+msgstr "Tidsfrister"
 
 #. module: project
 #: code:addons/project/project.py:155
 #, python-format
 msgid "Operation Not Permitted !"
-msgstr "Operation Not Permitted !"
+msgstr "Funktionen ej tillåten !"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:69
@@ -80,7 +80,7 @@ msgstr "CHECK: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Användarens e-post"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -92,12 +92,12 @@ msgstr "Avslutat arbete"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
 msgid "Task Delegate"
-msgstr ""
+msgstr "Aktivitetsdelegering"
 
 #. module: project
 #: field:project.task.delegate,planned_hours_me:0
@@ -107,7 +107,7 @@ msgstr "Timmar som ska valideras"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Vilande projekt"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -121,22 +121,22 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Återstarta projekt"
 
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr ""
+msgstr "Ger ordningsföljden vid listning av projekt"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fel! projektets startdatum måste föregå projekets slutdatum."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluation Task"
-msgstr ""
+msgstr "Omvärdering av aktiviteten"
 
 #. module: project
 #: field:project.project,members:0
@@ -146,12 +146,12 @@ msgstr "Projektmedlemmar"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "Aktiviteter per delegerare"
+msgstr "Aktiviteter per deltagare"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "mars"
 
 #. module: project
 #: view:project.task:0
@@ -170,7 +170,7 @@ msgid ""
 "the customer when a task is closed."
 msgstr ""
 "Huvud som läggs till i början av det epost-meddelande som skickas till "
-"kunden när en aktivtet är avslutad."
+"uppdragsgivaren när en aktivtet är avslutad."
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -180,18 +180,18 @@ msgstr "Mina aktiviteter"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr "Error ! You cannot create recursive tasks."
+msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bolag"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "Vilande aktiviteter"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -201,7 +201,7 @@ msgstr "Din aktivitets titel"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etappnamn"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -211,7 +211,7 @@ msgstr "Sätt till vilande"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Viktigt"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -221,17 +221,17 @@ msgstr "Definiera behov och planerade timmar"
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Byt etapp"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "Nytt projekt baserat på en mall"
+msgstr "Nytt projekt från mall"
 
 #. module: project
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fel! Du kan inte eskalera till samma projekt"
 
 #. module: project
 #: selection:report.project.task.user,priority:0
@@ -242,23 +242,23 @@ msgstr "Mycket bråttom"
 #: help:project.task.delegate,project_id:0
 #: help:project.task.delegate,user_id:0
 msgid "User you want to delegate this task to"
-msgstr ""
+msgstr "En användare vill delegera detta ärende till"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "My Task"
-msgstr ""
+msgstr "Mina aktiviteter"
 
 #. 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 "Dag"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projekt och etapper"
 
 #. module: project
 #: view:project.project:0
@@ -281,7 +281,7 @@ msgstr "Aktivitet"
 #. module: project
 #: view:project.project:0
 msgid "Members"
-msgstr ""
+msgstr "Medlemmar"
 
 #. module: project
 #: view:board.board:0
@@ -294,17 +294,17 @@ msgstr "Mina öppna aktiviteter"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Ange projektledare eller projektledarens e-postadress."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "För att avbryta aktiviteten"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projektaktivitetsarbete"
 
 #. module: project
 #: view:project.project:0 view:project.task:0 field:project.task,notes:0
@@ -314,13 +314,13 @@ msgstr "Anteckningar"
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs remaining hours"
-msgstr ""
+msgstr "Planerad tid jämfört med återstående"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_delay:0
 msgid "Avg. Plan.-Eff."
-msgstr ""
+msgstr "Gen.plan.-eff."
 
 #. module: project
 #: help:project.task,active:0
@@ -329,16 +329,19 @@ msgid ""
 "boolean 'active' field: if the task is linked to a template or unactivated "
 "project, it will be hidden unless specifically asked."
 msgstr ""
+"Detta fält beräknas automatiskt och har samma beteende som \"aktiva\" "
+"fältet: om aktiviteten är kopplad till en mall eller inaktiverat projektet "
+"kommer det att döljas om den inte uttryckligen erterfrågas."
 
 #. module: project
 #: field:project.task,name:0 field:report.project.task.user,name:0
 msgid "Task Summary"
-msgstr ""
+msgstr "Aktivitetssammanfattning"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Not a Template Task"
-msgstr ""
+msgstr "Inte en aktivitetsmall"
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
@@ -360,7 +363,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Visa endast aktiviteter med tidsfrist"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -373,17 +376,17 @@ msgstr "Avbruten"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr "Epost huvud"
+msgstr "Epost-huvud"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Byt till nästa etapp"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -393,7 +396,7 @@ msgstr "Avslutade aktiviteter"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Färgindex"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -403,7 +406,7 @@ msgstr "Konfiguration"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Innevarande månad"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -413,7 +416,7 @@ msgstr "Delegerar aktiviteter till den andra användaren"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -427,18 +430,18 @@ msgid ""
 "propose a message to send by email to the customer."
 msgstr ""
 "Om du kryssar i denna kommer användaren att för möjlighet att skicka ett "
-"epostmeddelande till kunden när en aktivitet avslutas."
+"epostmeddelande till uppdragsgivaren när en aktivitet avslutas."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Test"
 
 #. module: project
 #: code:addons/project/project.py:829
 #, python-format
 msgid "Task '%s' closed"
-msgstr "Task '%s' closed"
+msgstr "Aktivitet '%s' stängd"
 
 #. module: project
 #: model:ir.model,name:project.model_account_analytic_account
@@ -460,63 +463,63 @@ msgstr "Planering"
 #: view:project.task:0 field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "Slutdatum"
+msgstr "Tidsfrist"
 
 #. module: project
 #: view:project.task.delegate:0 view:project.task.reevaluate:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Klara"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Byt färg"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva objekt."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopia)"
 
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Ny aktivitet"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "# aktiviteter"
 
 #. module: project
 #: view:project.task:0
 msgid "Previous"
-msgstr ""
+msgstr "Bakåt"
 
 #. module: project
 #: field:project.vs.hours,user_id:0 field:report.project.task.user,user_id:0
 msgid "Assigned To"
-msgstr ""
+msgstr "Tilldelad"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Avslutsdatum: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Du kan inte ha två användare med samma användarid !"
 
 #. module: project
 #: view:project.project:0
@@ -536,12 +539,12 @@ msgstr "Mina projekt"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
 
 #. module: project
 #: view:project.task:0
 msgid "Next"
-msgstr ""
+msgstr "Nästa"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -551,23 +554,23 @@ msgstr "Från status preliminär, det kommer att få status öppen"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "# dagar"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Öppna projekt"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Du måste tilldela medarbetare till projektet '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -591,7 +594,7 @@ msgstr "Projektaktivitet"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -602,34 +605,34 @@ msgstr "Beräknas som: Nedlagd tid + Återstående tid."
 #: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
 msgid "Cumulative Flow"
-msgstr ""
+msgstr "Kummulativt flöde"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,hours_effective:0
 msgid "Effective Hours"
-msgstr ""
+msgstr "Faktisk tid"
 
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Utvärdera aktivitetsrubrik"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Omvärdera"
 
 #. module: project
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Övertrasserad försening"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -640,7 +643,7 @@ msgstr "Medel"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Vilande aktiviteter"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -652,19 +655,19 @@ msgstr "Återstående timmar"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Registeringsdatum"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Återstående tid"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -686,7 +689,7 @@ msgstr "Ej tilldelade aktiviteter"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Non Assigned Tasks to users"
-msgstr ""
+msgstr "Icke tilldelade aktiviteter"
 
 #. module: project
 #: help:project.project,planned_hours:0
@@ -694,6 +697,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Summan av planerad tid för alla aktiviteter relaterade till detta projekt "
+"och underliggande."
 
 #. module: project
 #: view:project.project:0 view:project.task:0 selection:project.task,state:0
@@ -704,7 +709,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 "Väntande"
+msgstr "Vilande"
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -725,12 +730,12 @@ msgstr "Tilläggsinformation"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Burndowndiagram över aktiviteter"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -744,7 +749,7 @@ msgstr "Startdatum"
 #: view:project.project:0 field:project.task.type,project_ids:0
 #, python-format
 msgid "Projects"
-msgstr "Projects"
+msgstr "Projekt"
 
 #. module: project
 #: view:project.task:0 field:project.task,type_id:0
@@ -752,7 +757,7 @@ msgstr "Projects"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapp"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -761,12 +766,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 ""
+"Definiera de etapper som kommer att användas i projektet från skapandet av "
+"aktiviteten fram till avslutandet av aktiviteten, uppgiften eller ärendet. "
+"Du kommer att använda dessa etapper för att följa utvecklingen för att "
+"utföra en aktivitet eller ett ärende."
 
 #. module: project
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Aktivieteten '%s' är startad."
 
 #. module: project
 #: view:project.task:0
@@ -776,7 +785,7 @@ msgstr "Datum"
 #. module: project
 #: help:project.task.delegate,name:0
 msgid "New title of the task delegated to the user"
-msgstr ""
+msgstr "Ny rubrik på aktiviteten delegerad till användaren"
 
 #. module: project
 #: code:addons/project/project.py:155
@@ -785,11 +794,13 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Du kan inte radera projekt med aktiviteter. Försök i stället att deaktivera "
+"det."
 
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
-msgstr ""
+msgstr "Projekt vs planerade och totalt antal timmar"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
@@ -799,7 +810,7 @@ msgstr "Utkast öppna ärenden"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "januari"
 
 #. module: project
 #: field:project.task,delay_hours:0
@@ -809,14 +820,14 @@ msgstr "Fördröjda timmar"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Mycket viktigt"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
 #: model:ir.ui.menu,name:project.menu_project_task_user_tree
 #: view:report.project.task.user:0
 msgid "Tasks Analysis"
-msgstr ""
+msgstr "Aktivietetsanalys"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
@@ -830,6 +841,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Om du kryssar denna ruta, kommer projektledaren att få e-post vid varje "
+"tillfälle en aktivitet slutförs av detta projektlag."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -847,7 +860,7 @@ msgstr "Projekt"
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "_Evaluate"
-msgstr ""
+msgstr "_Utvärdera"
 
 #. module: project
 #: view:board.board:0
@@ -858,18 +871,18 @@ msgstr "Min dashboard"
 #: 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 "Etapper"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Backa en etapp"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Projekt"
+msgstr "Projekthantering"
 
 #. module: project
 #: field:res.company,project_time_mode_id:0
@@ -879,13 +892,13 @@ msgstr "Projektets tidsenhet"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "Pågående"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
 #: view:project.task.delegate:0
 msgid "Project Task Delegate"
-msgstr ""
+msgstr "Projektaktivitetsdelegering"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -901,12 +914,12 @@ msgstr "Aktiviteter"
 #. module: project
 #: view:project.project:0
 msgid "Parent"
-msgstr ""
+msgstr "Överliggande"
 
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Märk som blockerad"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -920,16 +933,25 @@ msgid ""
 "configuration. With the project_mrp module, sales orders can create tasks "
 "automatically when they are confirmed."
 msgstr ""
+"En aktivitet är ett arbete eller uppgift som måste genomföras. Varje "
+"användare arbetar i sin egen lista över aktiviteter där användaren själv kan "
+"rapportera nedlagd tid och framsteg. Han kan arbeta och stänga uppgiften "
+"själv eller delegera den till en annan användare. När en aktivitet "
+"delegeras, försätts aktiviteten i vänteläge och öppnas igen när resultatet "
+"av delegeringen är granskat och målet med aktiviteten uppnått.  Om du "
+"installerar project_timesheet-modulen kan nedlagt arbete faktureras på "
+"grundval av projektet. Med project_mrp-modulen kan säljorder skapa uppgifter "
+"automatiskt när de bekräftas."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "september"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "december"
 
 #. module: project
 #: field:project.task,progress:0
@@ -945,17 +967,21 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
+"Om aktiviteten är skapad, är status 'Preleminär'.\n"
+" Då aktiviteten startas, övergår status till 'Pågående'.\n"
+" Om granskning är påkallad är status 'Vilande'.\n"
+" Då aktiviteten är slutförd, är status 'Klar'."
 
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Omvärdera aktivitet"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -966,12 +992,12 @@ msgstr "Projektets aktiviteter"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Aktivitetsetapper"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Design"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -984,7 +1010,7 @@ msgstr "Planerade timmar"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Granska aktivitetsetapperna"
 
 #. module: project
 #: view:project.project:0
@@ -994,24 +1020,24 @@ msgstr "Status: %(state)s"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Ger sorteringsordning vid listning av aktiviteter."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: project
 #: selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Klart för fortsättning"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
 msgid "Parent Tasks"
-msgstr ""
+msgstr "Överliggande aktiviteter"
 
 #. module: project
 #: selection:project.task,kanban_state:0
@@ -1019,7 +1045,7 @@ msgstr ""
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Hindrade"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1027,11 +1053,13 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Aktiviteter med förloppet 99.99 % kan stängas om den är klar eller omvärdera "
+"tiden"
 
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontaktadress"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1041,6 +1069,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"En aktivitets kanbanstatus anger speciella situationer som påverkar "
+"aktiviteten:\n"
+"  * Normal är standardsituationen\n"
+"  * Blockerad indikerar något hindrar utförandet av denna aktivitet\n"
+"  * Klar att avsluta indikerar aktiviteten är redo för nästa etapp"
 
 #. module: project
 #: view:project.project:0
@@ -1050,23 +1083,23 @@ msgstr "Användare: %(user_id)s"
 #. module: project
 #: view:project.project:0
 msgid "Billing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "För att byta till delegerat läge"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioritet"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: view:project.project:0
 msgid "Templates of Projects"
-msgstr ""
+msgstr "Mallprojekt"
 
 #. module: project
 #: view:project.project:0
@@ -1076,18 +1109,18 @@ msgstr "Administration"
 #. module: project
 #: model:ir.model,name:project.model_project_task_reevaluate
 msgid "project.task.reevaluate"
-msgstr ""
+msgstr "project.task.reevaluate"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "KONTROLL: %s"
 
 #. module: project
 #: view:project.project:0
 msgid "Member"
-msgstr ""
+msgstr "Medlem"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
@@ -1098,6 +1131,7 @@ msgstr "Projektaktiviteter"
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
 msgstr ""
+"Uppskatta tid som krävs för att stänga ärendet av den delegerade användaren"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1116,12 +1150,12 @@ msgstr "Låg"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanbanstatus"
 
 #. module: project
 #: view:project.project:0
 msgid "Performance"
-msgstr ""
+msgstr "Prestanda"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -1130,11 +1164,15 @@ 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 ""
+"Med denna rapport kan du analysera effektiviteten för dina projekt och dina "
+"projektdeltagare. Du kan analysera stora mängder av aktiviteter, nedlagd tid "
+"jämfört med de planerade timmar, det genomsnittliga antalet dagar för att "
+"öppna eller stänga en aktivitet etc."
 
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Byt typ"
 
 #. module: project
 #: help:project.project,members:0
@@ -1142,6 +1180,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Projektmedlemmar är användare som får tillgång till relaterade aktiviteter "
+"till detta projekt."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1151,24 +1191,24 @@ msgstr "Projektledare"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "För att ändra till klarstatus"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Aktiviteter per användare och projekt"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "augusti"
 
 #. module: project
 #: view:project.task:0 selection:project.task,kanban_state:0
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1179,7 +1219,7 @@ msgstr "Projektnamn"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Aktivitetshistorik"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1187,17 +1227,19 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Ny status för din egen aktivietet. Vilande aktiviteter aktiveras automatiskt "
+"när den delegerade aktiviteten stängs."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Vänligen ange uppdragsgivare eller uppdragsgivarens e-postadress."
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "juni"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -1208,13 +1250,13 @@ msgstr "Total tid"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagar i behandling"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
 #: model:ir.ui.menu,name:project.menu_board_project
 msgid "Project Dashboard"
-msgstr "Projekt dashboard"
+msgstr "Projektinfopanel"
 
 #. module: project
 #: view:project.task:0
@@ -1224,39 +1266,39 @@ msgstr "Återaktivera"
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: project
 #: field:project.project,active:0
 msgid "Active"
-msgstr "Active"
+msgstr "Aktiv"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagar för att öppna"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "november"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Skapa ditt första projekt"
 
 #. module: project
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Projektet '%s' har stängts."
 
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Aktiviteters kummulativa flöde"
 
 #. module: project
 #: view:project.task:0
@@ -1266,12 +1308,12 @@ msgstr "Aktivitetsutgåva"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "oktober"
 
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Granska planerad tid och öppna aktiviteter"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1279,16 +1321,18 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"Beräknas som skillnaden mellan projektledarens planerade timmar och "
+"aktivitetens totala antal timmar."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations History"
-msgstr ""
+msgstr "Delegeringshistorik"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: help:project.project,active:0
@@ -1296,32 +1340,33 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Om det aktiva fältet är Falskt, kan du gömma projektet utan att radera det."
 
 #. module: project
 #: view:project.task:0
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bolag"
 
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Projekt där jag medverkar"
 
 #. module: project
 #: view:project.project:0
 msgid "Search Project"
-msgstr ""
+msgstr "Sök projekt"
 
 #. module: project
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Projektet '%s' har öppnats."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1332,7 +1377,7 @@ msgstr "Datum"
 #. module: project
 #: model:ir.ui.menu,name:project.next_id_86
 msgid "Dashboard"
-msgstr ""
+msgstr "Infopanel"
 
 #. module: project
 #: help:res.company,project_time_mode_id:0
@@ -1341,16 +1386,16 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects (project_timesheet module), "
-"don't forget to setup the right unit of measure in your employees."
+"Detta ställer in den måttenhet som används i projekt och aktiviteter.\n"
+"Om du använder tidrapporten kopplad till projekt (project_timesheet "
+"modulen), glöm inte att ställa in rätt måttenhet för dina medarbetare."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:43
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Error"
-msgstr "Error"
+msgstr "Fel"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -1360,12 +1405,12 @@ msgstr "Användarens projekt"
 #. module: project
 #: view:project.task.delegate:0
 msgid "_Delegate"
-msgstr ""
+msgstr "_Delegera"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
 msgid "Number of Days to Open the task"
-msgstr ""
+msgstr "Antal dagar innan aktiviteten startas"
 
 #. module: project
 #: field:project.task,delegated_user_id:0
@@ -1375,7 +1420,7 @@ msgstr "Delegerad till"
 #. module: project
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historik"
 
 #. module: project
 #: field:project.task,user_id:0 view:report.project.task.user:0
@@ -1394,18 +1439,18 @@ msgstr ""
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Rubrik för din aktivitetsgranskning"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökade filter..."
 
 #. module: project
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "Vänligen radera projektet som är länkat till detta konto först."
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1427,13 +1472,13 @@ msgstr "Status"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "Användaren som ärendet delegeras till måste anges"
 
 #. module: project
 #: code:addons/project/project.py:862
 #, python-format
 msgid "Task '%s' set in progress"
-msgstr "Task '%s' set in progress"
+msgstr "Aktivitet '%s' satt i status framsteg"
 
 #. module: project
 #: view:project.project:0
@@ -1464,7 +1509,7 @@ msgstr "Klar"
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
@@ -1476,7 +1521,7 @@ msgstr "Avbryt"
 #. module: project
 #: selection:project.vs.hours,state:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1506,7 +1551,7 @@ msgstr "Pågår"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "Aktivitetsanalys"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1515,22 +1560,24 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Fortfarande öppna underliggande aktiviteter\n"
+"Vänligen avbryt eller avsluta underliggande aktiviteter först."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Etapper gemensamma med alla projekt"
 
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
 
 #. module: project
 #: field:project.task.history,user_id:0
 #: field:project.task.history.cumulative,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: project
 #: field:project.project,resource_calendar_id:0
@@ -1540,18 +1587,18 @@ msgstr "Arbetstid"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "Projekt där jag är ansvarig"
 
 #. module: project
 #: code:addons/project/project.py:959
 #, python-format
 msgid "The task '%s' is pending."
-msgstr ""
+msgstr "Aktiviteten '%s' är vilande"
 
 #. module: project
 #: model:ir.model,name:project.model_project_vs_hours
 msgid " Project vs  hours"
-msgstr ""
+msgstr " Projekt vs timmar"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1564,6 +1611,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Totalt antal timmar förbrukade på alla aktiviteter relaterade till detta "
+"projekt och underliggande."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1584,27 +1633,27 @@ msgstr "Varna projektledaren"
 #. module: project
 #: field:report.project.task.user,delay_endings_days:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Passerad tidsfrist"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline
 msgid "My Task's Deadlines"
-msgstr "Mina aktiviteters deadlines"
+msgstr "Tidsfrist för mina aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
 msgid "Re-evaluate Task"
-msgstr ""
+msgstr "Ovärdera aktivitet"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
 msgid "Development"
-msgstr ""
+msgstr "Utveckling"
 
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
-msgstr ""
+msgstr "Min återstående tid per projekt"
 
 #. module: project
 #: field:project.task,description:0 view:project.task.type:0
@@ -1620,7 +1669,7 @@ msgstr "Viktigt"
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "maj"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -1630,7 +1679,7 @@ msgstr "Granska ärende"
 #. module: project
 #: field:task.by.days,total_task:0
 msgid "Total tasks"
-msgstr ""
+msgstr "Totalt för alla aktiviteter"
 
 #. module: project
 #: help:project.task.type,project_default:0
@@ -1638,18 +1687,20 @@ msgid ""
 "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."
 msgstr ""
+"Om du markerar detta fält kommer denna etapp att föreslås som standard på "
+"varje nytt projekt. Befintliga projekt påverkas inte av detta."
 
 #. 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 "Mina delegerade aktiviteter"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "Uppgift: %(name)s"
+msgstr "Aktivitet: %(name)s"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1675,7 +1726,7 @@ msgstr "Mina konton som skall fakturerar"
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
 msgid "Deployment"
-msgstr ""
+msgstr "Driftsättning"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1686,7 +1737,7 @@ msgstr "Projektaktiviteter"
 #: code:addons/project/project.py:851
 #, python-format
 msgid "The task '%s' is done"
-msgstr ""
+msgstr "Aktiviteten '%s' är klar"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -1694,11 +1745,13 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Summan av alla timmar för aktiviteter relaterat till detta projekt och "
+"underliggande."
 
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "Gemensamt med alla projekt"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1708,35 +1761,35 @@ msgstr "När aktiviteten är avslutad sätts status till klar."
 #. module: project
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Uppdragsgivare"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
 #: field:project.task.history,end_date:0
 #: field:project.task.history.cumulative,end_date:0
 msgid "End Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "februari"
 
 #. 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 "Aktiviteter per dag"
 
 #. module: project
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Bolagsnamnet måste vara unikt !"
 
 #. module: project
 #: view:project.task:0
 msgid "Edit"
-msgstr ""
+msgstr "Ändra"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1751,22 +1804,22 @@ msgstr "Sammanställning av arbete"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "Månad-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
 msgid "Number of Days to close the task"
-msgstr ""
+msgstr "Dagar för att genomföra aktiviteten"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
 msgid "Month-1"
-msgstr ""
+msgstr "Månad-1"
 
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "april"
 
 #. module: project
 #: field:project.task,effective_hours:0
@@ -1776,7 +1829,7 @@ msgstr "Nedlagda timmar"
 #. module: project
 #: view:project.project:0 view:project.task:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
@@ -1786,12 +1839,12 @@ msgstr "Öppna avslutade aktiviteter"
 #. module: project
 #: view:project.task.type:0
 msgid "Common"
-msgstr ""
+msgstr "Vanlig"
 
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Förbrukade timmar"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_review_task_stage
@@ -1799,48 +1852,51 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Etapperna kan vara gemensamma med alla projekt eller knytas till ett visst "
+"projekt. Varje enskild aktivitet kommer följa de olika etapperna för att "
+"kunna fullföljas."
 
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Ger ordningsföljden vid listning av projekt."
 
 #. module: project
 #: code:addons/project/wizard/mail_compose_message.py:64
 #, python-format
 msgid "Task '%s' Closed"
-msgstr ""
+msgstr "Aktivitet '%s' är avslutad"
 
 #. 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
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Burndowndiagram"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned Tasks"
-msgstr ""
+msgstr "Tilldelade aktiviteter"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
 msgid "Overpassed Tasks"
-msgstr ""
+msgstr "Övertrasserade aktiviteter"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Year"
-msgstr ""
+msgstr "Innevarande år"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1852,7 +1908,7 @@ msgstr "Sekvens"
 #: 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 "Återstående tid per projekt"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1860,8 +1916,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
-"For tillagd i slutet av det epostmeddelande som skickas till kunden när en "
-"aktivitet är avslutad."
+"Fot tillagd i slutet av det epostmeddelande som skickas till uppdragsgivaren "
+"när en aktivitet är avslutad."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1875,6 +1931,15 @@ msgid ""
 "to invoice the time spent on a project task, you can find project tasks to "
 "be invoiced in the billing section."
 msgstr ""
+"Ett projekt innehåller en uppsättning aktiviteter eller ärenden som kommer "
+"att utföras av dina tilldelade resurser. Ett projekt kan vara hierarkiskt "
+"uppbyggt med över-/underliggande-relationer mellan projekten. Detta gör att "
+"du kan beskriva stora och komplexa projektstrukturer med olika faser "
+"fördelade över projektets löptid. Varje användare kan ställa in sitt "
+"standardprojekt i sina egna inställningar för att automatiskt filtrera "
+"uppgifter eller frågor som just han brukar fungera på. Om du väljer att "
+"fakturera nedlagd tid, kan du hitta projektuppgifter som ska faktureras i "
+"faktureringsfliken."
 
 #. module: project
 #: view:project.task:0 view:project.task.work:0
@@ -1890,7 +1955,7 @@ msgstr "Granskningsstatus"
 #: code:addons/project/project.py:882
 #, python-format
 msgid "Task '%s' cancelled"
-msgstr "Task '%s' cancelled"
+msgstr "Aktivitet '%s' avbruten"
 
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
@@ -1898,27 +1963,29 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Estimerad tid för dig att utvärdera genomfört arbete av användaren som fick "
+"sig aktiviteten delegerad"
 
 #. module: project
 #: view:project.project:0 model:res.groups,name:project.group_project_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Registreringsdatum"
 
 #. module: project
 #: code:addons/project/project.py:890
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Aktiviteten '%s' är avbruten."
 
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "För att byta till öppen status"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1931,13 +1998,13 @@ msgstr "Företag"
 #: code:addons/project/project.py:804
 #, python-format
 msgid "Send Email after close task"
-msgstr ""
+msgstr "Skicka e-post vid avslutade aktiviteter"
 
 #. module: project
 #: view:project.project:0 field:project.project,type_ids:0
 #: view:project.task.type:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Aktivitetsetapper"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1947,12 +2014,12 @@ msgstr "Delegera din aktivitet till den andra användaren"
 #. module: project
 #: view:project.project:0 field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr "Epost fot"
+msgstr "Epost-fot"
 
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "Pågående aktiviteter"
 
 #~ msgid "Subproject"
 #~ msgstr "Underprojekt"
@@ -2282,12 +2349,16 @@ msgstr ""
 #~ msgid "Planned"
 #~ msgstr "Planned"
 
-#, python-format
-#~ msgid "Couldn't send mail because your email address is not configured!"
-#~ msgstr "Couldn't send mail because your email address is not configured!"
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-post editor"
 
 #, python-format
 #~ msgid ""
 #~ "You can not delete a project with tasks. I suggest you to deactivate it."
 #~ msgstr ""
-#~ "You can not delete a project with tasks. I suggest you to deactivate it."
+#~ "Projekt med aktiviteter går inte att raderas, avaktivera det i stället."
+
+#, python-format
+#~ msgid "Couldn't send mail because your email address is not configured!"
+#~ msgstr ""
+#~ "Kunde inte skicka e-post eftersom e-postadress inte är konfigurerad !"
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index c7be3d49b24..3da06fa3dc8 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index b7bb1be2b67..c93a666c720 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -653,7 +653,7 @@ msgstr "Kalan Saatler"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index a0e22426770..67d7ec1e338 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index e2715c85615..f76abbfc84d 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "Số giờ còn lại"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index e7cbbecc253..bcbbd62c34e 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-02-15 05:27+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -50,7 +50,7 @@ msgstr "我的任务"
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr "警告业务伙伴"
+msgstr "通知业务伙伴"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -645,8 +645,8 @@ msgstr "剩余的小时数"
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "邮件合并向导"
+msgid "Email composition wizard"
+msgstr ""
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2441,3 +2441,6 @@ msgstr "进行中的任务"
 
 #~ msgid "Timesheets"
 #~ msgstr "工作时间表"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "邮件合并向导"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index e883a489a05..cd3ec585938 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-02-09 05:57+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-06-28 04:37+0000\n"
+"X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -645,7 +645,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
-msgid "E-mail composition wizard"
+msgid "Email composition wizard"
 msgstr ""
 
 #. module: project
-- 
cgit v1.2.3


From 7ed6f5052db5e76d3e5bbf49f086121ee40b82f2 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:36 +0530
Subject: [IMP]remove all select=1 and select=2

bzr revid: sgo@tinyerp.com-20120628061736-ujwe0swulvrcrkjt
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7d3f595e2c5..97b051426f8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -50,7 +50,7 @@
                     </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
+                            <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'}"/>
@@ -97,10 +97,10 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="company_id"  groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+                                    <field name="currency_id"  groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
-- 
cgit v1.2.3


From 1b87acc3f498e3cbe67cc84bdaa6ad1b4d3afd02 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 11:53:43 +0530
Subject: [IMP]remove layout option from sheet

bzr revid: sgo@tinyerp.com-20120628062343-7xbs4bvyivnhergs
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 97b051426f8..c12ed792bd5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,7 +38,7 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" layout="auto">
+                <sheet string="Project" >
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
-- 
cgit v1.2.3


From 1702b2335d7febda80f38846cec386053c0e41a0 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:10:05 +0530
Subject: [IMP]remove tabs and add spaces instead of them

bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
---
 addons/project/process/task_process.xml      | 4 ++--
 addons/project/res_partner_view.xml          | 6 +++---
 addons/project/security/project_security.xml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 1c5fba12596..4a73bfd00d1 100644
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -90,8 +90,8 @@
 
 
         <!--
-        	Process Action
-    	-->
+            Process Action
+        -->
 
         <record id="process_transition_action_draftopentask0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;do_open&quot;&quot;&quot;" name="action"/>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 2a648791056..4940e6c367c 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -13,7 +13,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
-          </record>	
+          </record>    
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
@@ -27,8 +27,8 @@
                             <field name="user_id"/>
                             <field name="date_deadline"/>
                             <field name="state" invisible="1"/>
-			    <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-			    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 829ec6c6971..e972ea8fe73 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -22,12 +22,12 @@
         <field name="name">Task's Work on Tasks</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-	
+    
     <record id="group_time_work_estimation_tasks" model="res.groups">
         <field name="name">Time Estimation on Tasks</field>
         <field name="implied_ids" eval="[(4, ref('group_tasks_work_on_tasks'))]"/>
         <field name="category_id" ref="base.module_category_hidden"/>
-    </record>		
+    </record>        
 
     <record id="group_delegate_task" model="res.groups">
         <field name="name">Task Delegation</field>
-- 
cgit v1.2.3


From 46f2c2c9ca8662de3c1c8fc79fbdb1355367bc49 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 28 Jun 2012 14:18:20 +0200
Subject: [IMP] improvements during code review

bzr revid: qdp-launchpad@openerp.com-20120628121820-r8bxfzq38fy8pcgt
---
 addons/project/project_view.xml              | 8 ++++----
 addons/project/res_partner_view.xml          | 6 +++---
 addons/project/security/project_security.xml | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c12ed792bd5..9da977e44d7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -38,7 +38,7 @@
                     <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
-                <sheet string="Project" >
+                <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <label for="name" class="oe_edit_only" string="Project Name"/>
                     <h1>
@@ -50,7 +50,7 @@
                     </h2>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" />
+                            <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'}"/>
@@ -97,10 +97,10 @@
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id"  groups="base.group_multi_company" widget="selection" required="1"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <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="currency_id" groups="base.group_multi_company" required="1"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 4940e6c367c..3b019e51af6 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -13,7 +13,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>
-          </record>    
+          </record>
         <record id="view_task_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.task.info.inherit</field>
             <field name="model">res.partner</field>
@@ -27,8 +27,8 @@
                             <field name="user_id"/>
                             <field name="date_deadline"/>
                             <field name="state" invisible="1"/>
-                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index e972ea8fe73..f867285138a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -27,7 +27,7 @@
         <field name="name">Time Estimation on Tasks</field>
         <field name="implied_ids" eval="[(4, ref('group_tasks_work_on_tasks'))]"/>
         <field name="category_id" ref="base.module_category_hidden"/>
-    </record>        
+    </record>
 
     <record id="group_delegate_task" model="res.groups">
         <field name="name">Task Delegation</field>
-- 
cgit v1.2.3


From 2269c81cf8cbf6302c301387342d7ed445ea4b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 28 Jun 2012 14:30:48 +0200
Subject: [FIX] project_task: fixed typo in class name.

bzr revid: tde@openerp.com-20120628123048-cfs1zmzyub8l1a0l
---
 addons/project/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index b93b45f1840..31f7706b575 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1138,7 +1138,7 @@ class task(base_stage, osv.osv):
         """ Returns the user_ids that have to perform an action
             :return: dict { record_id: [user_ids], }
         """
-        result = super(project_task, self).get_needaction_user_ids(cr, uid, ids, context=context)
+        result = super(task, self).get_needaction_user_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'draft' and obj.user_id:
                 result[obj.id].add(obj.user_id.id)
-- 
cgit v1.2.3


From c15de911e5e041ef42d8cb41336715b1c6f8a616 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 28 Jun 2012 18:30:09 +0200
Subject: [IMP] fix project dashboard, removing bad reports, imp dashboard

bzr revid: fp@tinyerp.com-20120628163009-xeiz0xewhqzoimxl
---
 addons/project/board_project_view.xml        | 39 +------------
 addons/project/report/project_cumulative.xml |  2 +-
 addons/project/report/project_report.py      | 85 ----------------------------
 addons/project/security/ir.model.access.csv  |  2 -
 4 files changed, 3 insertions(+), 125 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 09a7fe57bab..9e532438a7c 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -2,41 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
-            <field name="name">project.vs.remaining.hour.tree</field>
-            <field name="model">project.vs.hours</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Remaining Hours Per Project" colors="pink:state=='draft';blue:state=='pending';black:state=='open';red:state=='cancelled';grey:state=='close';yellow:state=='template'">
-                    <field name="project"/>
-                    <field name="remaining_hours"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_project_vs_remaining_hours_graph" model="ir.ui.view">
-             <field name="name">project.vs.remaining.hour.graph</field>
-             <field name="model">project.vs.hours</field>
-             <field name="type">graph</field>
-             <field name="arch" type="xml">
-                 <graph string="Project vs remaining hours" type="bar">
-                     <field name="project"/>
-                     <field name="state" group="True"/>
-                     <field name="remaining_hours" operator="+"/>
-                 </graph>
-             </field>
-        </record>
-
-        <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
-            <field name="name">Remaining Hours Per Project</field>
-            <field name="res_model">project.vs.hours</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
-            <field name="view_id" ref="view_project_vs_remaining_hours_graph"/>
-        </record>
-
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
@@ -74,10 +39,10 @@
                 <form string="My Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(my_open_tasks_action)d" string="My Tasks" creatable="true"/>
+                            <action name="%(my_open_tasks_action)d" string="My Tasks"/>
                         </column>
                         <column>
-                            <action name="%(action_project_vs_remaining_hours_graph)d" string="My Remaining Hours by Project"/>
+                            <action name="%(action_view_task_history_cumulative)d" string="Open Tasks"/>
                         </column>
                     </board>
                 </form>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 69daeefc758..22d43237538 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -79,7 +79,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_task_history_graph"/>
             <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
+            <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 58f7739e96d..30d8717efb6 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -120,88 +120,3 @@ class report_project_task_user(osv.osv):
 
 report_project_task_user()
 
-#This class is generated for project deshboard purpose
-class project_vs_hours(osv.osv):
-    _name = "project.vs.hours"
-    _description = " Project vs  hours"
-    _auto = False
-    _columns = {
-        'project': fields.char('Project', size=128, required=True),
-        'remaining_hours': fields.float('Remaining Hours', readonly=True),
-        'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
-        'planned_hours': fields.float('Planned Hours', readonly=True),
-        'total_hours': fields.float('Total Hours', readonly=True),
-        'state': fields.selection([('draft','Draft'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Close'),('template', 'Template')], 'Status', required=True, readonly=True)
-    }
-    _order = 'project desc'
-
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'project_vs_hours')
-        cr.execute("""
-            CREATE or REPLACE view project_vs_hours as (
-                select
-                      min(pt.id) as id,
-                      aaa.user_id as user_id,
-                      aaa.name as project,
-                      aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours,
-                      sum(pt.planned_hours) as planned_hours,
-                      sum(pt.total_hours) as total_hours
-                 FROM project_project as pp,
-                       account_analytic_account as aaa,
-                       project_task as pt
-                 WHERE aaa.id=pp.analytic_account_id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id
-                 GROUP BY aaa.user_id,aaa.state,aaa.name
-                 UNION All
-                 SELECT
-                      min(pt.id) as id,
-                      pur.uid as user_id,
-                      aaa.name as project,
-                      aaa.state,
-                      sum(pt.remaining_hours) as remaining_hours,
-                      sum(pt.planned_hours) as planned_hours,
-                      sum(pt.total_hours) as total_hours
-                 FROM project_project as pp,
-                      project_user_rel as pur,
-                      account_analytic_account as aaa,
-                      project_task as pt
-                 WHERE pur.project_id=pp.id and pt.project_id=pp.id and pp.analytic_account_id=aaa.id AND pur.uid != aaa.user_id
-                 GROUP BY pur.uid,aaa.state,aaa.name
-            )
-        """)
-
-project_vs_hours()
-
-class task_by_days(osv.osv):
-    _name = "task.by.days"
-    _description = "Task By Days"
-    _auto = False
-    _columns = {
-        'day': fields.char('Day', size=128, required=True),
-        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
-        'total_task': fields.float('Total tasks', readonly=True),
-        'project_id':fields.many2one('project.project', 'Project')
-     }
-    _order = 'day desc'
-
-    def init(self, cr):
-        tools.sql.drop_view_if_exists(cr, 'task_by_days')
-        cr.execute("""
-            CREATE or REPLACE view task_by_days as (
-                SELECT
-                    min(pt.id) as id,
-                    to_char(pt.create_date, 'YYYY-MM-DD') as day,
-                    count(*) as total_task,
-                    pt.state as state,
-                    pt.project_id
-                FROM
-                    project_task as pt
-                GROUP BY
-                    to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
-            )
-        """)
-
-task_by_days()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 5b51dc85e7c..8cea913984d 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -5,8 +5,6 @@ access_project_task_type_user,project.task.type user,model_project_task_type,pro
 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
 access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1
-access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1
-access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1
 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
-- 
cgit v1.2.3


From e613d2e134f05540512ea0ac7f8310d3a9a58a93 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 28 Jun 2012 18:44:15 +0200
Subject: fix

bzr revid: fp@tinyerp.com-20120628164415-t29w0qpvj73wju2u
---
 addons/project/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 2c38b2e56c1..dad67f5dc30 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -53,8 +53,8 @@ Dashboard for project members that includes:
         "process/task_process.xml",
         "res_partner_view.xml",
         "report/project_report_view.xml",
-        "board_project_view.xml",
         'report/project_cumulative.xml',
+        "board_project_view.xml",
         'res_config_view.xml',
     ],
     'demo_xml': [
-- 
cgit v1.2.3


From 3c6d5dabfb10938ef3b7135d0b3565ff962ce6ae Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Fri, 29 Jun 2012 04:38:53 +0000
Subject: Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120629043853-120u6x3erpg73gq2
---
 addons/project/i18n/nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 7ec14fe77f2..2b0700612cb 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -7,13 +7,13 @@ 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: 2012-02-10 15:16+0000\n"
+"PO-Revision-Date: 2012-06-28 12:50+0000\n"
 "Last-Translator: Erwin <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: 2012-06-28 04:36+0000\n"
+"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
 "X-Generator: Launchpad (build 15505)\n"
 
 #. module: project
@@ -658,7 +658,7 @@ msgstr "Resterende uren"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: project
 #: view:report.project.task.user:0
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/project/res_config_view.xml                     | 2 +-
 addons/project/wizard/project_task_delegate_view.xml   | 2 +-
 addons/project/wizard/project_task_reevaluate_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index f5efa64fa9a..ff1511d49f2 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Project" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 0eb37be406d..7dd1cdb9465 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Project Task Delegate" version="7.0">
                     <header>
-                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight_on_dirty"/>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
                          or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index de94e0079b1..066f15582b4 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -9,7 +9,7 @@
             <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_on_dirty"/>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3


From 7416e2443fb3b45900c787959bff354e4bfe66bd Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 11:32:56 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
---
 addons/project/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7f35354b94f..5e4f758e439 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -29,10 +29,10 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending" />
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" />
-                    <button name="set_pending" string="Pending" type="object" states="open" />
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
                     <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
                     <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
@@ -321,20 +321,20 @@
                             <button name="do_open" string="Start Task" type="object"
                                     states="draft,pending" class="oe_highlight"/>
                             <button name="do_draft" string="Draft" type="object"
-                                    states="cancel,done" />
+                                    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}"/>
                             <button name="action_close" string="Done" type="object"
-                                    states="open,draft,pending" />
+                                    states="draft,open,pending"/>
                             <button name="do_pending" string="Pending" type="object"
-                                    states="open" />
+                                    states="open"/>
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
                                     states="pending,open,draft" groups="project.group_delegate_task"/>
                             <button name="do_cancel" string="Cancel" type="object"
-                                    states="draft,open,pending" />
+                                    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"
-- 
cgit v1.2.3


From 37a06585213bb8f88890e1dae188730cb81c5c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 2 Jul 2012 16:57:47 +0200
Subject: [IMP] needaction: cleaned definitions in addons.

bzr revid: tde@openerp.com-20120702145747-3m3s78tfmavjj61k
---
 addons/project/project.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index 46af30f77a8..f614d257594 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1144,9 +1144,7 @@ class task(base_stage, osv.osv):
         result = super(task, self).get_needaction_user_ids(cr, uid, ids, context=context)
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.state == 'draft' and obj.user_id:
-                result[obj.id].add(obj.user_id.id)
-            elif obj.state == 'draft':
-                result[obj.id].add(uid)
+                result[obj.id].append(obj.user_id.id)
         return result
 
     def message_get_subscribers(self, cr, uid, ids, context=None):
-- 
cgit v1.2.3


From 1ac5f6fa99fb15a1f58c1f7232ef9e0a803a63c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 2 Jul 2012 18:13:23 +0200
Subject: [REVIEW] Some cleaning after review and before merging.

bzr revid: tde@openerp.com-20120702161323-wvd0j6ng3dz56ifj
---
 addons/project/project.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/project')

diff --git a/addons/project/project.py b/addons/project/project.py
index f614d257594..487daa834bb 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1138,7 +1138,9 @@ class task(base_stage, osv.osv):
         return 'Task'
 
     def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action
+        """ Returns the user_ids that have to perform an action.
+            Add to the previous results given by super the document responsible
+            when in draft mode.
             :return: dict { record_id: [user_ids], }
         """
         result = super(task, self).get_needaction_user_ids(cr, uid, ids, context=context)
-- 
cgit v1.2.3


From 27a1ac68d4443dfd08f8b15141716a8c98098faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Jul 2012 14:41:11 +0200
Subject: [REF] ThreadView widget renamed to mail_thread. Also added some
 footers where they were not used.

bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cf501740456..f18cfe4b682 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -148,7 +148,7 @@
                     </notebook>
                 </sheet>
                 <footer>
-                    <field name="message_ids" widget="ThreadView"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </footer>
                 </form>
             </field>
@@ -496,7 +496,7 @@
                     </notebook>
                     </sheet>
                     <footer>
-                        <field name="message_ids" widget="ThreadView"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </footer>
                 </form>
             </field>
-- 
cgit v1.2.3