From 9cad752f27f07cba4c87613ccad86d6a1539a3fc Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 5 Oct 2010 18:38:02 +0530
Subject: [PATCH 01/10] [ADD] project_scrum : added charts on Scrum Dashboard
 [REM/FIX] project_planning,project : removed my button from planning
 statistics and change domin on projects button

bzr revid: jas@tinyerp.com-20101005130802-fcs0m27g8l9pk7o2
---
 addons/project/report/project_report_view.xml |  2 +-
 .../project_planning_view.xml                 |  6 ++-
 .../board_project_scrum_view.xml              | 44 ++++++++++++++++++-
 addons/project_scrum/project_scrum.py         |  1 +
 4 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9521d321000..ea454aced03 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -91,7 +91,7 @@
 	                    <field name="project_id">
 	                        <filter icon="terp-folder-blue"
 	                        		string="My Projects"
-	                        		help="My Projects" domain="[('project_id','=',uid)]"/>
+	                        		help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                           </field>
 
                           <field name="user_id" widget="selection">
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 9363413e4a2..ff8e42ec7b8 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -277,8 +277,6 @@
             <field name="arch" type="xml">
                 <search string="Planning statistics">
                     <group col="10" colspan="4">
-                        <filter icon="gtk-execute" string="My" domain="[('user_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]" help="My Plannings Statistics"/>
-                        <separator orientation="vertical"/>
                         <field name="planning_id" select="1"/>
                         <field name="user_id" select="1"/>
                         <field name="account_id" select="1" groups="base.group_extended"/>
@@ -300,6 +298,10 @@
             parent="hr.menu_hr_reporting" />
         <menuitem action="action_account_analytic_planning_stat_form"
             id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+            <menuitem  action="action_account_analytic_planning_stat_form"
+                       icon="terp-graph"
+                       id="menu_board_planning"
+                       parent="project.next_id_86"/>
 
 <!--        Analytic account Form -->
 
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 8b22233558b..5859121c3c5 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -26,6 +26,43 @@
              	</tree>
             </field>
         </record>
+        <record id="view_project_task_graph" model="ir.ui.view">
+            <field name="name">project.task.graph</field>
+            <field name="model">project.task</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Task Progress" type="bar">
+                    <field name="project_id"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="delay_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_project_task_graph" model="ir.actions.act_window">
+            <field name="name">Task Progress</field>
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
+
+        <record id="view_backlog_progress_graph" model="ir.ui.view">
+            <field name="name">project.scrum.sprint.graph</field>
+            <field name="model">project.scrum.product.backlog</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Backlog Progress" type="bar">
+                    <field name="sprint_id"/>
+                    <field name="effective_hours" operator="+"/>
+                    <field name="expected_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="action_view_backlog_progress_graph" model="ir.actions.act_window">
+            <field name="name">Backlog Progress</field>
+            <field name="res_model">project.scrum.product.backlog</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph</field>
+        </record>
         <record id="action_sprint_all_dashboard_tree" model="ir.actions.act_window">
             <field name="name">Sprint's List</field>
             <field name="res_model">project.scrum.sprint</field>
@@ -41,8 +78,13 @@
                 <form string="My Board">
                     <hpaned>
                         <child1>
-                   				 <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+               				 <action colspan="4" height="220" name="%(action_sprint_all_dashboard_tree)d" string="Sprints" width="510"/>
+                             <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
+                        <child2>
+                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progess" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progess" width="510"/>
+                        </child2>
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index f472369211b..2a4ea180d47 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -237,6 +237,7 @@ class project_scrum_product_backlog(osv.osv):
         return True
 
     def button_postpone(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Warning!'), _( "Are you sure to postpone Backlog ?"))
         if context is None:
             context = {}
         for product in self.browse(cr, uid, ids, context=context):

From 4388a5815b68ed901de733a8a63c6ad7df264655 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 6 Oct 2010 11:40:16 +0530
Subject: [PATCH 02/10] [ADD]: project_scrum: added wizard on Postpone button
 of the Product Backlogs

bzr revid: jas@tinyerp.com-20101006061016-zns1izbah5uwqxzx
---
 addons/project_scrum/__openerp__.py         |  1 +
 addons/project_scrum/project_scrum.py       | 18 ------------------
 addons/project_scrum/project_scrum_view.xml | 10 +++++-----
 addons/project_scrum/wizard/__init__.py     |  1 +
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 3e18db77f68..30b9f84276b 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -56,6 +56,7 @@
         'wizard/project_scrum_backlog_merger_view.xml',
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
+        'wizard/project_scrum_postpone_view.xml',
         'process/project_scrum_process.xml',
         "board_project_scrum_view.xml",
     ],
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 2a4ea180d47..d4c8911c459 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -236,24 +236,6 @@ class project_scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
-    def button_postpone(self, cr, uid, ids, context=None):
-        raise osv.except_osv(_('Warning!'), _( "Are you sure to postpone Backlog ?"))
-        if context is None:
-            context = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            tasks_id = []
-            for task in product.tasks_id:
-                if task.state != 'done':
-                    tasks_id.append(task.id)
-
-            clone_id = self.copy(cr, uid, product.id, {
-                'name': 'PARTIAL:'+ product.name ,
-                'sprint_id':False,
-                'tasks_id':[(6, 0, tasks_id)],
-                                })
-        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return True
-
     _columns = {
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..14a1c84e1d9 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -62,7 +62,7 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1"/>
                         <field domain="[('project_id','=',project_id), ('state','in', ['draft','open'])]" name="sprint_id" select="1"/>
-      					<button name="button_postpone" string="Postpone" type="object"
+     					<button name="%(action_postpone_wizard)d" string="Postpone" type="action"
 							help="Postpone backlog" colspan="2"
                          icon="gtk-convert"  attrs="{'invisible':[('state','=','done')]}"/>
                         <field name="user_id" select="1"/>
@@ -192,7 +192,7 @@
         <!--
               Scrum Sprint
        -->
-        
+
         <record id="view_scrum_sprint_calendar" model="ir.ui.view">
             <field name="name">project.scrum.sprint.calendar</field>
             <field name="model">project.scrum.sprint</field>
@@ -204,7 +204,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">project.scrum.sprint.tree</field>
             <field name="model">project.scrum.sprint</field>
@@ -357,7 +357,7 @@
         <!--
               Daily Meeting
        -->
-        
+
         <record id="view_scrum_meeting_calendar" model="ir.ui.view">
             <field name="name">project.scrum.meeting.calendar</field>
             <field name="model">project.scrum.meeting</field>
@@ -369,7 +369,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">project.scrum.meeting.tree</field>
             <field name="model">project.scrum.meeting</field>
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 92ed57d7d7e..22865e7c83e 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -22,6 +22,7 @@
 import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
+import project_scrum_postpone
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From f63146eed99df772b78f09f837c059bc3865cfa1 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Wed, 6 Oct 2010 15:09:32 +0530
Subject: [PATCH 03/10] [IMP] project_scrum : improved view of postpone wizard

bzr revid: jas@tinyerp.com-20101006093932-ong6vxgir7i50tvt
---
 addons/project_scrum/__openerp__.py               | 2 +-
 addons/project_scrum/board_project_scrum_view.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 30b9f84276b..accbae25604 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -54,9 +54,9 @@
         'project_scrum_report.xml',
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
+        'wizard/project_scrum_postpone_view.xml',
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
-        'wizard/project_scrum_postpone_view.xml',
         'process/project_scrum_process.xml',
         "board_project_scrum_view.xml",
     ],
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 5859121c3c5..e9581fa9707 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -82,8 +82,8 @@
                              <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
                         <child2>
-                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progess" width="510"/>
-                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progess" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progress" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progress" width="510"/>
                         </child2>
                     </hpaned>
                 </form>

From 2780c63d4819262b4f2c4a8a63d9c73fb92862fe Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Thu, 7 Oct 2010 13:07:31 +0530
Subject: [PATCH 04/10] [ADD] project_scrum : added project_scrum_postpone.py
 and project_scrum_postpone_view.xml

bzr revid: jas@tinyerp.com-20101007073731-wgbv4nv8rnhqyafn
---
 .../wizard/project_scrum_postpone.py          | 22 +++++++++++++++
 .../wizard/project_scrum_postpone_view.xml    | 28 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 addons/project_scrum/wizard/project_scrum_postpone.py
 create mode 100644 addons/project_scrum/wizard/project_scrum_postpone_view.xml

diff --git a/addons/project_scrum/wizard/project_scrum_postpone.py b/addons/project_scrum/wizard/project_scrum_postpone.py
new file mode 100644
index 00000000000..b4576f88ab8
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_postpone.py
@@ -0,0 +1,22 @@
+from osv import osv
+from osv import fields
+
+class postpone_wizard(osv.osv_memory):
+    _name="postpone.wizard"
+    def button_postpone(self, cr, uid, ids, context=None):
+        log_obj=self.pool.get('project.scrum.product.backlog')
+        if context is None:
+            context = {}
+        for product in log_obj.browse(cr, uid, ids, context=context):
+            tasks_id = []
+            for task in product.tasks_id:
+                if task.state != 'done':
+                    tasks_id.append(task.id)
+            clone_id = log_obj.copy(cr, uid, product.id, {
+                'name': 'PARTIAL:'+ product.name ,
+                'sprint_id':False,
+                'tasks_id':[(6, 0, tasks_id)],
+                                })
+        log_obj.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return {}
+postpone_wizard()
\ No newline at end of file
diff --git a/addons/project_scrum/wizard/project_scrum_postpone_view.xml b/addons/project_scrum/wizard/project_scrum_postpone_view.xml
new file mode 100644
index 00000000000..995e84d612e
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_postpone_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="postpone_wizard_form">
+            <field name="name">postpone_wizard</field>
+            <field name="model">postpone.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Postpone Backlog">
+                    <separator string="Postpone" colspan="4"/>
+                    <label align="0.0" colspan="2" string="Are you sure to postpone Backlog ?"/>
+                    <separator string="" colspan="4"/>
+                    <group colspan="4">
+                    <button special="cancel" type="object" string="Close" icon="gtk-cancel"/>
+                    <button name="button_postpone" type="object" string="Ok" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <record model="ir.actions.act_window" id="action_postpone_wizard">
+            <field name="name">Postpone</field>
+            <field name="res_model">postpone.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>

From 3c9671dc675bd4d1e2a2c6c9a7cffee3693626a3 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Thu, 7 Oct 2010 14:54:29 +0530
Subject: [PATCH 05/10] [IMP] project_scrum : improved postpone wizard

bzr revid: jas@tinyerp.com-20101007092429-lfqizg17626ezu3m
---
 addons/project_scrum/project_scrum.py           | 17 +++++++++++++++++
 .../wizard/project_scrum_postpone.py            | 17 ++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index d4c8911c459..f472369211b 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -236,6 +236,23 @@ class project_scrum_product_backlog(osv.osv):
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
+    def button_postpone(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            tasks_id = []
+            for task in product.tasks_id:
+                if task.state != 'done':
+                    tasks_id.append(task.id)
+
+            clone_id = self.copy(cr, uid, product.id, {
+                'name': 'PARTIAL:'+ product.name ,
+                'sprint_id':False,
+                'tasks_id':[(6, 0, tasks_id)],
+                                })
+        self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+        return True
+
     _columns = {
         'name' : fields.char('Feature', size=64, required=True),
         'note' : fields.text('Note'),
diff --git a/addons/project_scrum/wizard/project_scrum_postpone.py b/addons/project_scrum/wizard/project_scrum_postpone.py
index b4576f88ab8..95169873f3a 100644
--- a/addons/project_scrum/wizard/project_scrum_postpone.py
+++ b/addons/project_scrum/wizard/project_scrum_postpone.py
@@ -4,19 +4,6 @@ from osv import fields
 class postpone_wizard(osv.osv_memory):
     _name="postpone.wizard"
     def button_postpone(self, cr, uid, ids, context=None):
-        log_obj=self.pool.get('project.scrum.product.backlog')
-        if context is None:
-            context = {}
-        for product in log_obj.browse(cr, uid, ids, context=context):
-            tasks_id = []
-            for task in product.tasks_id:
-                if task.state != 'done':
-                    tasks_id.append(task.id)
-            clone_id = log_obj.copy(cr, uid, product.id, {
-                'name': 'PARTIAL:'+ product.name ,
-                'sprint_id':False,
-                'tasks_id':[(6, 0, tasks_id)],
-                                })
-        log_obj.write(cr, uid, ids, {'state':'cancel'}, context=context)
-        return {}
+       self.pool.get('project.scrum.product.backlog').button_postpone(cr, uid, ids, context)
+       return {}
 postpone_wizard()
\ No newline at end of file

From 2c71620b6faa9d1b680b0a333dfaf7ec5a93abad Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Mon, 11 Oct 2010 17:39:52 +0530
Subject: [PATCH 06/10] [IMP/FIX]  document : improved tooltips for Type and
 fixed Group by Storage

bzr revid: jas@tinyerp.com-20101011120952-95evv1jbm0r00tn9
---
 addons/document/document_directory.py | 24 ++++++++++++------------
 addons/document/document_view.xml     |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 3486359f183..652f42f0938 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ from tools.translate import _
 class document_directory(osv.osv):
     _name = 'document.directory'
     _description = 'Directory'
-    _order = 'name desc'
+    _order = 'name'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
         'write_date': fields.datetime('Date Modified', readonly=True),
@@ -44,13 +44,13 @@ class document_directory(osv.osv):
         'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([ 
+        'type': fields.selection([
             ('directory','Static Directory'),
             ('ressource','Folders per resource'),
             ],
             'Type', required=True, select=1,
-            help="Defines directory's behaviour."),
-        
+            help="Each directory can either have the type Static or be linked to another resource. A static directory, as with Operating Systems, is the classic directory that can contain a set of files. The directories linked to systems resources automatically possess sub-directories for each of resource types defined in the parent directory."),
+
         'ressource_type_id': fields.many2one('ir.model', 'Resource model',
             help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
@@ -95,13 +95,13 @@ class document_directory(osv.osv):
                 return objid.browse(cr, uid, mid, context=context).res_id
         except Exception:
                 return None
-        
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c),
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
-        'ressource_id': lambda *a: 0,        
+        'ressource_id': lambda *a: 0,
         'storage_id': _get_def_storage,
         'resource_find_all': True,
     }
@@ -151,7 +151,7 @@ class document_directory(osv.osv):
     _constraints = [
         (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id'])
     ]
-    
+
     def __init__(self, *args, **kwargs):
         super(document_directory, self).__init__(*args, **kwargs)
 
@@ -172,7 +172,7 @@ class document_directory(osv.osv):
         """
         if not context:
                 context = {}
-            
+
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
     def get_dir_permissions(self, cr, uid, ids ):
@@ -180,7 +180,7 @@ class document_directory(osv.osv):
         """
         assert len(ids) == 1
         id = ids[0]
-        
+
         cr.execute( "SELECT count(dg.item_id) AS needs, count(ug.uid) AS has " \
                 " FROM document_directory_group_rel dg " \
                 "   LEFT OUTER JOIN res_groups_users_rel ug " \
@@ -197,7 +197,7 @@ class document_directory(osv.osv):
             Return a tuple (node_dir, remaining_path)
         """
         return (nodes.node_database(context=ncontext), uri)
-        
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default ={}
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 13e4cff02d4..b7a5840dc7d 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -148,6 +148,7 @@
                 <field name="name"/>
                 <field name="type"/>
                 <field name="user_id"/>
+                <field name="storage_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
             </tree>
@@ -403,7 +404,7 @@
         src_model="res.partner"
         groups="base.group_extended"/>
 
-    <act_window 
+    <act_window
     	context="{'search_default_parent_id': [active_id]}"
         id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"

From faf41056d830aa6d4c3767de3b0aa296cc33736d Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 11:22:05 +0530
Subject: [PATCH 07/10] [IMP] : project_scrum : improved task progress and
 backlog progress chart

bzr revid: jas@tinyerp.com-20101012055205-5m8imrf270cpzvm6
---
 .../board_project_scrum_view.xml              |  12 +-
 addons/project_scrum/project_scrum_demo.xml   | 213 +++++++++++++++++-
 2 files changed, 208 insertions(+), 17 deletions(-)

diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index e9581fa9707..22aac896c88 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -26,23 +26,23 @@
              	</tree>
             </field>
         </record>
-        <record id="view_project_task_graph" model="ir.ui.view">
+        <record id="view_task_progress_graph" model="ir.ui.view">
             <field name="name">project.task.graph</field>
             <field name="model">project.task</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Task Progress" type="bar">
-                    <field name="project_id"/>
-                    <field name="planned_hours" operator="+"/>
-                    <field name="delay_hours" operator="+"/>
+                    <field name="sprint_id"/>
+                    <field name="effective_hours" operator="+"/>
                 </graph>
             </field>
         </record>
-        <record id="action_view_project_task_graph" model="ir.actions.act_window">
+        <record id="action_view_task_progress_graph" model="ir.actions.act_window">
             <field name="name">Task Progress</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_task_progress_graph"/>
         </record>
 
         <record id="view_backlog_progress_graph" model="ir.ui.view">
@@ -82,7 +82,7 @@
                              <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d" string="Burndown Chart" type="action" icon="gtk-print"/>
                         </child1>
                         <child2>
-                             <action colspan="4" height="220" name="%(action_view_project_task_graph)d" string="Task Progress" width="510"/>
+                             <action colspan="4" height="220" name="%(action_view_task_progress_graph)d" string="Task Progress" width="510"/>
                              <action colspan="4" height="220" name="%(action_view_backlog_progress_graph)d" string="Backlog Progress" width="510"/>
                         </child2>
                     </hpaned>
diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
index 2c627c89b09..bd31913dfb9 100644
--- a/addons/project_scrum/project_scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -13,6 +13,24 @@
             <field model="res.users" name="product_owner_id" search="[('login','=','demo')]"/>
         </record>
 
+        <record id="scrum_project_2" model="project.project">
+            <!-- FIXME !!! -->
+            <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
+            <field model="res.users" name="manager" search="[('login','=','admin')]"/>
+            <field name="expected_hours">200</field>
+            <field name="name">OpenERP - MRP branch</field>
+            <field model="res.users" name="product_owner_id" search="[('login','=','admin')]"/>
+        </record>
+
+        <record id="scrum_project_3" model="project.project">
+            <!-- FIXME !!! -->
+            <field name="tasks">[24, 25, 28, 26, 27, 29, 30, 31, 32, 33, 34, 35, 37, 36, 38]</field>
+            <field model="res.users" name="manager" search="[('login','=','admin')]"/>
+            <field name="expected_hours">98</field>
+            <field name="name">OpenERP - CRM branch</field>
+            <field model="res.users" name="product_owner_id" search="[('login','=','admin')]"/>
+        </record>
+
         <!-- Resource: project_scrum.sprint -->
 
         <record id="scrum_sprint_0" model="project.scrum.sprint">
@@ -23,6 +41,133 @@
             <field name="project_id" ref="scrum_project_1"/>
             <field name="state">open</field>
         </record>
+       <record id="scrum_sprint_1" model="project.scrum.sprint">
+            <field name="name">sprint 1</field>
+            <field name="date_start">2010-01-01</field>
+            <field name="date_stop">2010-01-15</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_2" model="project.scrum.sprint">
+            <field name="name">sprint 2</field>
+            <field name="date_start">2010-01-16</field>
+            <field name="date_stop">2010-01-30</field>
+            <field name="expected_hours">100.0</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_3" model="project.scrum.sprint">
+            <field name="name">sprint 3</field>
+            <field name="date_start">2010-02-01</field>
+            <field name="date_stop">2010-02-15</field>
+            <field name="expected_hours">89.0</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_4" model="project.scrum.sprint">
+            <field name="name">sprint 4</field>
+            <field name="date_start">2010-02-16</field>
+            <field name="date_stop">2010-02-28</field>
+            <field name="expected_hours">125.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_5" model="project.scrum.sprint">
+            <field name="name">sprint 5</field>
+            <field name="date_start">2010-03-01</field>
+            <field name="date_stop">2010-03-15</field>
+            <field name="expected_hours">178.0</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_6" model="project.scrum.sprint">
+            <field name="name">sprint 6</field>
+            <field name="date_start">2010-03-16</field>
+            <field name="date_stop">2010-01-30</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="expected_hours">200.0</field>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_7" model="project.scrum.sprint">
+            <field name="name">sprint 7</field>
+            <field name="date_start">2010-04-01</field>
+            <field name="date_stop">2010-04-15</field>
+            <field name="expected_hours">175.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_8" model="project.scrum.sprint">
+            <field name="name">sprint 8</field>
+            <field name="date_start">2010-04-16</field>
+            <field name="date_stop">2010-04-30</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field name="expected_hours">122.0</field>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_9" model="project.scrum.sprint">
+            <field name="name">sprint 9</field>
+            <field name="date_start">2010-05-01</field>
+            <field name="date_stop">2010-05-15</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_10" model="project.scrum.sprint">
+            <field name="name">sprint 10</field>
+            <field name="date_start">2010-05-16</field>
+            <field name="date_stop">2010-05-30</field>
+            <field name="expected_hours">78.0</field>
+            <field name="project_id" ref="scrum_project_2"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
+
+        <record id="scrum_sprint_11" model="project.scrum.sprint">
+            <field name="name">sprint 11</field>
+            <field name="date_start">2010-06-01</field>
+            <field name="date_stop">2010-06-15</field>
+            <field name="project_id" ref="scrum_project_3"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','demo')]"/>
+            <field name="state">open</field>
+        </record>
+
+         <record id="scrum_sprint_12" model="project.scrum.sprint">
+            <field name="name">sprint 12</field>
+            <field name="date_start">2010-06-16</field>
+            <field name="date_stop">2010-06-30</field>
+            <field name="project_id" ref="scrum_project_1"/>
+            <field name="product_owner_id" ref="base.user_root"/>
+            <field model="res.users" name="scrum_master_id" search="[('login','=','admin')]"/>
+            <field name="state">open</field>
+        </record>
 
         <!-- Resource: project.product.backlog -->
 
@@ -40,53 +185,99 @@
             <field name="name">New accounting module</field>
             <field name="expected_hours">111.0</field>
             <field name="note">The accounting module of OpenERP (financial accounting and management accounting) is being reshaped. New functionalities will be added: intangible assets, a new way of presenting ledgers and bookings, new stock valuation calculation, and lots of predefined reports. </field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_1"/>
 			<field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_2"/>
         </record>
         <record id="scrum_product_backlog_2" model="project.scrum.product.backlog">
             <field name="priority">3</field>
             <field name="name">Automated Plugin System to install/uninstall modules</field>
             <field name="expected_hours">4.0</field>
             <field name="note">We have to develop a plug-in system which will enable to install/remove modules. The basic version of OpenERP will include only the required minimum, and you will select the modules thanks to the plug-in manager. This allows you to limit your system to your real needs: quality management, localisations, project and service management, marketing campaigns, and so on... </field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_2"/>
             <field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_3"/>
         </record>
         <record id="scrum_product_backlog_3" model="project.scrum.product.backlog">
             <field name="name">Review all terms</field>
             <field name="expected_hours">8.0</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_3"/>
             <field name="state">done</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
         <record id="scrum_product_backlog_4" model="project.scrum.product.backlog">
             <field name="name">Bugfixes</field>
             <field name="expected_hours">6.0</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_4"/>
             <field name="state">open</field>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="project_id" ref="scrum_project_2"/>
         </record>
         <record id="scrum_product_backlog_5" model="project.scrum.product.backlog">
             <field name="name">Test for 3.2.0 Publishing</field>
             <field name="expected_hours">5.0</field>
             <field name="note">Test OpenERP to release stable 3.2.0 version. (may be 3.2.0-pre1 ?)</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
-            <field name="project_id" ref="scrum_project_1"/>
+            <field name="sprint_id" ref="scrum_sprint_5"/>
+            <field name="project_id" ref="scrum_project_3"/>
         </record>
         <record id="scrum_product_backlog_6" model="project.scrum.product.backlog">
             <field name="name">Reshape the complete menu</field>
             <field name="expected_hours">4.0</field>
             <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_6"/>
           	<field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
+
         <record id="scrum_product_backlog_7" model="project.scrum.product.backlog">
             <field name="name">Editable Trees</field>
             <field name="expected_hours">12.0</field>
             <field name="note">Editable trees in list and one2many_list widgets.</field>
-            <field name="sprint_id" ref="scrum_sprint_0"/>
+            <field name="sprint_id" ref="scrum_sprint_7"/>
+            <field name="project_id" ref="scrum_project_2"/>
+        </record>
+
+        <record id="scrum_product_backlog_8" model="project.scrum.product.backlog">
+            <field name="name">Reshape the complete menu</field>
+            <field name="expected_hours">3.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_8"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_3"/>
+        </record>
+
+        <record id="scrum_product_backlog_9" model="project.scrum.product.backlog">
+            <field name="name">Analysis Product phase</field>
+            <field name="expected_hours">10.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_9"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_1"/>
+        </record>
+
+        <record id="scrum_product_backlog_10" model="project.scrum.product.backlog">
+            <field name="name">Rearrange the Menu</field>
+            <field name="expected_hours">9.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_10"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_2"/>
+        </record>
+
+        <record id="scrum_product_backlog_11" model="project.scrum.product.backlog">
+            <field name="name">Complete change in list view</field>
+            <field name="expected_hours">8.0</field>
+            <field name="note">Restructure the OpenERP menu to be more like other ERPs.</field>
+            <field name="sprint_id" ref="scrum_sprint_11"/>
+            <field name="state">open</field>
+            <field name="project_id" ref="scrum_project_3"/>
+        </record>
+
+        <record id="scrum_product_backlog_12" model="project.scrum.product.backlog">
+            <field name="name">Reshape the complete menu</field>
+            <field name="expected_hours">2.0</field>
+            <field name="note">Set rule for Tax according to 2010-2011 Rules</field>
+            <field name="sprint_id" ref="scrum_sprint_12"/>
+            <field name="state">open</field>
             <field name="project_id" ref="scrum_project_1"/>
         </record>
 

From cebd5a055e2a2bd0e2ced4776e2c729d43d5029c Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 15:17:07 +0530
Subject: [PATCH 08/10] [IMP] document : improved domain for Related Documents

bzr revid: jas@tinyerp.com-20101012094707-3bh1fr8u0w2am89k
---
 addons/document/document_view.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b7a5840dc7d..5b8653cda8c 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -405,14 +405,10 @@
         groups="base.group_extended"/>
 
     <act_window
-    	context="{'search_default_parent_id': [active_id]}"
-        id="zoom_directory" name="Related Documents"
+        domain="[('parent_id', '=', active_id)]"
+    	id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
         src_model="document.directory"/>
-
-
-
-
 </data>
 </openerp>
 

From cbdd2134a8737b74be53a2a16fb4b864127f91f0 Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 15:55:37 +0530
Subject: [PATCH 09/10] [IMP] project_issue, project_long_term : improved
 string and corrected spelling mistake in demo file

bzr revid: jas@tinyerp.com-20101012102537-r35k4pe4ej56yxpt
---
 addons/project_issue/project_issue.py         | 10 +++----
 .../project_long_term_demo.xml                | 26 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2788b59ed7d..7aa501dd41b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,7 +141,7 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
-    
+
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
@@ -172,7 +172,7 @@ class project_issue(crm.crm_case, osv.osv):
         'canal_id': fields.many2one('res.partner.canal', 'Channel', help="The channels represent the different communication modes available with the customer." \
                                                                         " With each commercial opportunity, you can indicate the canall which is this opportunity source."),
         'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Severity'),
+        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'partner_name': fields.char("Employee's Name", size=64),
         'partner_mobile': fields.char('Mobile', size=32),
@@ -288,11 +288,11 @@ class project_issue(crm.crm_case, osv.osv):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{}}
-    
+
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
         if context is None:
             context = {}
-        result = {}    
+        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context)
@@ -442,7 +442,7 @@ class project_issue(crm.crm_case, osv.osv):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not context:
             context={}
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 30acac99377..4de53c0f38d 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-<!-- 
+<!--
 This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
         <!-- Users -->
-        
+
         <record id="res_users_analyst" model="res.users">
-            <field name="name">Phoung</field>
+            <field name="name">Phuong</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="login">phu</field>
             <field name="password">phu</field>
@@ -19,7 +19,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">al</field>
         </record>
         <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Qwintin</field>
+            <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>
@@ -91,8 +91,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-        
-        
+
+
 
         <!-- Projects -->
         <record id="project_integrate_openerp" model="project.project">
@@ -101,12 +101,12 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="type">normal</field>
             <field name="description">Integrate an Sale and Warehouse Management.</field>
             <field eval="[(6, 0, [
-                    ref('res_users_analyst'), 
-                    ref('res_users_project_manager'), 
-                    ref('res_users_technical_leader'), 
-                    ref('res_users_developer'), 
-                    ref('res_users_designer'), 
-                    ref('res_users_tester'), 
+                    ref('res_users_analyst'),
+                    ref('res_users_project_manager'),
+                    ref('res_users_technical_leader'),
+                    ref('res_users_developer'),
+                    ref('res_users_designer'),
+                    ref('res_users_tester'),
                     ref('res_users_finacial_manager')])]" name="members"/>
             <field name="user_id" ref="res_users_project_manager"/>
             <field name="name">Integrate an Sale and Warehouse Management.</field>
@@ -213,7 +213,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="resource_id" ref="resource_project_manager"/>
             <field name="phase_id" ref="project_phase_5"/>
         </record>
-        
+
         <record id="resource_allocation_9" model="project.resource.allocation">
             <field name="resource_id" ref="resource_analyst"/>
             <field name="phase_id" ref="project_phase_6"/>

From 2648dff04dd9d5a0ebababc0af9cc5e156cfc27b Mon Sep 17 00:00:00 2001
From: jas <jas@tinyerp.com>
Date: Tue, 12 Oct 2010 18:47:59 +0530
Subject: [PATCH 10/10] [IMP] project,project_gtd,project_scrum : improved
 Project Management->Tasks and Scrum->Product Backlogs

bzr revid: jas@tinyerp.com-20101012131759-m2o39yruaz9qcpht
---
 addons/project/project_view.xml                      | 4 ++--
 addons/project/wizard/project_task_delegate_view.xml | 2 +-
 addons/project_gtd/project_gtd.py                    | 2 +-
 addons/project_scrum/project_scrum_view.xml          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6efc64dd494..af29d46d9c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,7 +112,7 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1">
                             <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
-                       </field> 
+                       </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
@@ -380,7 +380,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index dc299826419..e5eeed35573 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -18,7 +18,7 @@
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
 		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
-           	                <field name="prefix" string="Validatation Task Title" colspan="4"/>
+           	                <field name="prefix" string="Validation Task Title" colspan="4"/>
                             <field name="state" colspan="4"/>
 		              </group>
                       <separator string="" colspan="4"/>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 47c7c02cba8..972b89c0cbb 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -107,7 +107,7 @@ class project_task(osv.osv):
         if res['type'] == 'search':
             tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]))
             search_extended ='''<newline/><group col="%d" expand="0" string="%s" groups="project_gtd.group_project_getting">''' % (len(tt)+7,_('Getting Things Done'))
-            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),)
+            search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True}" icon="gtk-new" string="%s"/>''' % (_('Inbox'),)
             search_extended += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 14a1c84e1d9..2aa7771f89a 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -141,7 +141,7 @@
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
                         <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Backlogs"/>
                         <separator orientation="vertical"/>
-                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
+                        <filter string="Edit" icon="gtk-execute" domain="[]" context="{'set_editable':'1'}"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id"/>