From f252e164eac32e2cd223bc0c1f242bcc07e9fe9f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 12:03:43 +0530
Subject: [PATCH 01/71] [IMP] project_long_term: Improve the icon

bzr revid: sbh@tinyerp.com-20100827063343-uhx18yz6ldsbam7e
---
 addons/project_long_term/project_long_term_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 4d2bab01fb9..a8d8cc632e8 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -72,9 +72,9 @@
             <field name="name">Resource Allocations</field>
             <field name="res_model">project.resource.allocation</field>
             <field name="view_type">form</field>
-            <field name="view_mode">gantt,tree,form</field>
+            <field name="view_mode">tree,form,gantt</field>
              <field name="context">{}</field>
-            <!--<field name="search_view_id" ref="view_project_phase_search"/>-->
+            <field name="search_view_id" ref="view_project_resource_allocation_search"/>
         </record>
 
 
@@ -254,7 +254,7 @@
             <field name="name">Project Phases</field>
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
-            <field name="view_mode">gantt,tree,form,calendar</field>
+            <field name="view_mode">tree,form,gantt,calendar</field>
             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>            
@@ -314,13 +314,13 @@
 
         <menuitem action="act_project_phase"
             groups="base.group_extended"
-            id="menu_project_phase"  icon="terp-project" parent="base.menu_project_long_term" sequence="1"/>
+            id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations"   icon="terp-project" parent="base.menu_project_long_term" sequence="2"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"  icon="terp-project"
+            groups="base.group_extended"  
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>

From 0b3e1f6eeb0aecd1e42f39461badb989d747a2f6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 12:17:00 +0530
Subject: [PATCH 02/71] [IMP] project:Group by task change percent to avg
 instead of sum

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1c71ab9cf5a..e29d7f3c49c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -328,7 +328,7 @@
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="remaining_hours" widget="float_time" avg="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
                         states="draft,open,pending"

From 8a219b0263768a1fcdc89434a2128196ebe13847 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 14:21:17 +0530
Subject: [PATCH 03/71] [Add] project: Add the wizard for taks_reivew

bzr revid: sbh@tinyerp.com-20100827085117-0gsmyajf05po8mv3
---
 addons/project/__openerp__.py                 |  3 +-
 addons/project/project_view.xml               |  1 +
 addons/project/wizard/__init__.py             |  1 +
 addons/project/wizard/project_task_review.py  | 57 +++++++++++++++++++
 addons/project/wizard/project_task_review.xml | 36 ++++++++++++
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 addons/project/wizard/project_task_review.py
 create mode 100644 addons/project/wizard/project_task_review.xml

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index b0e3880c243..cf0159cf5e2 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,6 +39,8 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
     "update_xml": [
         "security/project_security.xml",
         "wizard/project_task_delegate_view.xml",
+        "wizard/project_task_review.xml",
+        "wizard/project_close_task_view.xml",        
         "security/ir.model.access.csv",
         "project_data.xml",
         "project_view.xml",
@@ -46,7 +48,6 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
         "project_installer.xml",
         "res_partner_view.xml",
         "report/project_report_view.xml",
-        "wizard/project_close_task_view.xml",
         "board_project_view.xml",
         'board_project_manager_view.xml'
     ],
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e534221be37..b0960b6fe74 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -269,6 +269,7 @@
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
                                 <button name="do_close" states="pending,open" string="Done" type="object" icon="gtk-apply"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+ 								<button name="%(action_project_task_review)d" states="pending,open" string="Review" type="action" icon="gtk-convert"  />                                
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Delegations">
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 618eecf4b62..095a561e8d1 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -21,6 +21,7 @@
 
 import project_close_task
 import project_task_delegate
+import project_task_review
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/project/wizard/project_task_review.py b/addons/project/wizard/project_task_review.py
new file mode 100644
index 00000000000..7ce447f77ad
--- /dev/null
+++ b/addons/project/wizard/project_task_review.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero 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 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/>.
+#
+##############################################################################
+
+import time
+
+from osv import fields, osv
+from tools.translate import _
+from tools import email_send as email
+
+class project_task_review(osv.osv_memory):
+    """
+    Review Task
+    """
+    _name = "project.task.review"
+    _description = "Project Task  Review"
+    _columns = {
+        'user_id': fields.many2one('res.users', 'Review by'),
+        'description': fields.text('Description'),
+    }
+    def review(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.read(cr, uid, ids[0], [])
+        notes = data['description'] or ''
+        task_id=context.get('active_id',False)
+        task_obj = self.pool.get('project.task')
+        if data['user_id']:
+            user_name = self.pool.get('res.users').browse(cr, uid, data['user_id']).name or ''
+        description = _("Review By ") + user_name + _(" At ") + time.strftime('%Y-%m-%d %H:%M:%S')
+        description += "\n" + "=======================" + "\n"  + notes 
+        if task_id:    
+            task = task_obj.browse(cr, uid,task_id)            
+            description = task.description and task.description  + "\n\n" + description
+            task_obj.write(cr, uid, [task_id], {'description': description})
+        return {}
+  
+project_task_review()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_review.xml b/addons/project/wizard/project_task_review.xml
new file mode 100644
index 00000000000..f1351caec69
--- /dev/null
+++ b/addons/project/wizard/project_task_review.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_task_review" model="ir.ui.view">
+            <field name="name">Project Task Review</field>
+            <field name="model">project.task.review</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Project Task Review">
+              	<separator string="Review Task " colspan="4"/>            
+                      <group colspan="4">
+		                    <field name="user_id" colspan="4"/>
+			  				<separator string="Remark" colspan="4"/>   
+					  		<newline/>		                    
+		                   <field name="description" nolabel="1" colspan="4"/>
+                      </group>
+		              <group colspan="4" >
+		            		<button icon="gtk-close" special="cancel" string="Close"/>
+		            		<button icon="gtk-ok" name="review" string="Review" type="object"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+		<record id="action_project_task_review" model="ir.actions.act_window">
+	           <field name="name">Project Task Review</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.task.review</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_task_review"/>
+	           <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>

From 22423ccb6dcb88ea0165b0040821bec340f36c16 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 14:27:12 +0530
Subject: [PATCH 04/71] [Fix] Project: Fix the access right of project manager

bzr revid: sbh@tinyerp.com-20100827085712-nujxv3ohd00eo7ay
---
 addons/project/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index cdd939c79ec..1e4c26ccd03 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
-"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,0,0,0
+"access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
 "access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1

From 2ea45ff31ef9bdb5dc9b119efebde6349334c34f Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 14:50:44 +0530
Subject: [PATCH 05/71] [Fix] Project_long_term: Fix the access right of
 project manager

bzr revid: sbh@tinyerp.com-20100827092044-0ala82mbaocd7ycw
---
 .../security/ir.model.access.csv                 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 3653cd375f1..ac27c1c1425 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,9 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,0
-"access_project_phase_manager","project.phase manager","model_project_phase",project.group_project_manager,1,0,0,0
-"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation",project.group_project_manager,1,0,0,0
-"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation",base.group_system,1,0,0,0
-"access_project_phase_system","project.phase system","model_project_phase",base.group_system,1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource",project.group_project_user,1,1,1,1
+"access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,1,1,0
+"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
+"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
+"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
+"access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
+"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
+"access_resource_calendar_manager","resource.calendar manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1

From 85dc7713c00571df70e452e4b52b9a8814135910 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 15:08:35 +0530
Subject: [PATCH 06/71] [Add] project_messages add the access rule

bzr revid: sbh@tinyerp.com-20100827093835-d1ffvyf73k25utse
---
 addons/project_messages/__openerp__.py               | 3 ++-
 addons/project_messages/security/ir.model.access.csv | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py
index 352fe797f22..6394a73339c 100644
--- a/addons/project_messages/__openerp__.py
+++ b/addons/project_messages/__openerp__.py
@@ -32,7 +32,8 @@
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],
-    'update_xml': ['project_messages_view.xml'],
+    'update_xml': [ "security/ir.model.access.csv",
+                   'project_messages_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index b79a32fb2f5..8546b15d18d 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages",project.group_project_user,1,1,1,1
+"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,0,0,0
+"access_project_messages_manager","project.messages.manager","model_project_messages","project.group_project_manager",1,1,1,1

From 6cc4ac54e209b2f0b63ae553b1325a658dd91d84 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 15:51:31 +0530
Subject: [PATCH 07/71] [Fix] Fix  the access rule for user

bzr revid: sbh@tinyerp.com-20100827102131-6gxcemrr99bhe7ew
---
 addons/project/security/ir.model.access.csv | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 1e4c26ccd03..303d478b8f1 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,17 +1,17 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
 "access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
-"access_project_project","project.project","model_project_project","project.group_project_user",1,1,1,1
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,1,1,1
-"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,1,1,1
+"access_project_project","project.project","model_project_project","project.group_project_user",0,0,0,0
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",0,0,0,0
+"access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,0
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1
-"access_project_task","project.task","model_project_task","project.group_project_user",1,1,1,1
-"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,1,1
+"access_project_task","project.task","model_project_task","project.group_project_user",1,1,0,0
+"access_project_task_work","project.task.work","model_project_task_work","project.group_project_user",1,1,0,0
 "access_project_task_work_manager","project.task.work.manager","model_project_task_work","project.group_project_manager",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_project_vs_hours","project.vs.hours","model_project_vs_hours","project.group_project_user",1,0,0,0
+"access_task_by_days","task.by.days","model_task_by_days","project.group_project_user",1,0,0,0
 "access_partner_task user","base.res.partner user","base.model_res_partner","project.group_project_user",1,0,0,0
 "access_partner_task manager","base.res.partner manager","base.model_res_partner","project.group_project_manager",1,0,0,0
 "access_partner_address_task user","base.res.partner.address user","base.model_res_partner_address","project.group_project_user",1,0,0,0

From 1a97a74f695f6c36254876eb81f37434335e7276 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 16:08:42 +0530
Subject: [PATCH 08/71] [Fix] project_long_term: Fix  the access rule for user

bzr revid: sbh@tinyerp.com-20100827103842-m53cu2olo53kww89
---
 addons/project_long_term/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index ac27c1c1425..0f6db3ec6c8 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -9,3 +9,4 @@
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_calendar_manager","resource.calendar manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
+"access_resource_calendar_user","resource.calendar user","resource.model_resource_calendar","project.group_project_user",1,0,0,0

From 80fd96b9b575a120b8ae3fd790081255a7668b29 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 16:10:58 +0530
Subject: [PATCH 09/71] [Fix] project_long_term: Fix  the access rule resource
 for user

bzr revid: sbh@tinyerp.com-20100827104058-icj0gzh13nmx89gp
---
 addons/project_long_term/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 0f6db3ec6c8..540bbaf773a 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -5,7 +5,7 @@
 "access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
 "access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
 "access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,1,0,0
 "access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
 "access_resource_calendar_manager","resource.calendar manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1

From 5f6b14030265882ab1a43bfceaaa6e5d53104039 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 16:17:42 +0530
Subject: [PATCH 10/71] [IMP] project_long_term: set the access rule for
 Resource allocation

bzr revid: sbh@tinyerp.com-20100827104742-7fbc4qzttke685on
---
 addons/project_long_term/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 540bbaf773a..a2cbb2b3ddf 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,6 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,0,0,0
 "access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
 "access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
 "access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0

From a9eae0bdc0a08e42dd6c6e35dd88521898c5ffa4 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 16:32:37 +0530
Subject: [PATCH 11/71] [IMP] project: the access rule for Resource allocation

bzr revid: sbh@tinyerp.com-20100827110237-rqk5372vt0p789yp
---
 addons/project/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 303d478b8f1..01a7cd71065 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -2,7 +2,7 @@
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
 "access_account_analytic_account_manager","account.analytic.account","analytic.model_account_analytic_account","project.group_project_manager",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",0,0,0,0
-"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",0,0,0,0
+"access_account_analytic_account","account.analytic.account","analytic.model_account_analytic_account","project.group_project_user",1,0,0,0
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,0
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1

From b9af2733a53a4b4032c36d35392e7c25f05efb53 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 16:56:08 +0530
Subject: [PATCH 12/71] [IMP] project:  Add the security rule ofr Project
 Manager Dashboard

bzr revid: sbh@tinyerp.com-20100827112608-jwgpi7hrdwqr3eoi
---
 addons/project/board_project_manager_view.xml | 2 +-
 addons/project/security/project_security.xml  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml
index 76c40324d31..8b4270c8190 100644
--- a/addons/project/board_project_manager_view.xml
+++ b/addons/project/board_project_manager_view.xml
@@ -42,7 +42,7 @@
             <field name="view_id" ref="board_project_manager_form"/>
         </record>
 
-        <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="project.next_id_86" sequence="1" groups="project.group_project_user"/>
+        <menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="project.next_id_86" sequence="1" groups="project.group_project_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f968ffc51a3..cce319f095e 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -22,6 +22,10 @@
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
 
+    <record id="project.menu_board_project_manager" model="ir.ui.menu">
+        <field eval="[(4,ref('account.group_project_manager'))]" name="groups_id"/>
+    </record>
+    
     <record model="ir.rule" id="project_comp_rule">
         <field name="name">Project multi-company</field>
         <field name="model_id" ref="model_project_project"/>

From bd380c8dd8dba72d9817987ab60afd61058e1a0d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Fri, 27 Aug 2010 18:54:34 +0530
Subject: [PATCH 13/71] [IMP] small change

bzr revid: sbh@tinyerp.com-20100827132434-8w7muub6b9e9q6cw
---
 addons/project/security/project_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index cce319f095e..483dba736e7 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -23,7 +23,7 @@
     </record>
 
     <record id="project.menu_board_project_manager" model="ir.ui.menu">
-        <field eval="[(4,ref('account.group_project_manager'))]" name="groups_id"/>
+        <field eval="[(4,ref('project.group_project_manager'))]" name="groups_id"/>
     </record>
     
     <record model="ir.rule" id="project_comp_rule">

From a6f3d3c5a87eaf01a17f14aa93ebb35bc971cda8 Mon Sep 17 00:00:00 2001
From: "uco (Open ERP)" <uco@tinyerp.com>
Date: Tue, 31 Aug 2010 10:06:51 +0530
Subject: [PATCH 14/71] [ADD] project: Add view file name to __openerp__.py

bzr revid: uco@tinyerp.com-20100831043651-v96kvpbtujeghifw
---
 addons/project/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 3177744ea9c..08beddcfa0a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,6 +39,7 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
         "wizard/project_task_delegate_view.xml",
         "wizard/project_task_close_view.xml",
         "wizard/project_task_reevaluate_view.xml",
+        "wizard/project_task_review.xml",
         "security/ir.model.access.csv",
         "project_data.xml",
         "project_view.xml",

From fd65fd6ed065160a4f345135f29c7556b22b85da Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 15 Sep 2010 19:09:35 +0530
Subject: [PATCH 15/71] [IMP]: Usability improvements in project,
 project_scrum, project_long_term, project_messages + removed conflicts in
 base_setup/base_setup_installer.xml and
 document_ftp/wizard/ftp_configuration_view.xml after merge

bzr revid: rvo@tinyerp.co.in-20100915133935-i7atai99kmhep1k5
---
 addons/base_setup/base_setup_installer.xml    | 24 +------------------
 .../wizard/ftp_configuration_view.xml         |  8 +------
 addons/project/report/project_report_view.xml |  4 ++--
 .../wizard/project_task_close_view.xml        |  8 +++----
 .../wizard/project_task_delegate_view.xml     |  6 ++---
 .../wizard/project_task_reevaluate_view.xml   |  4 ++--
 addons/project/wizard/project_task_review.xml |  8 +++----
 .../project_long_term_view.xml                | 22 ++++++++++-------
 .../wizard/project_compute_phases_view.xml    |  2 +-
 .../wizard/project_compute_tasks_view.xml     |  4 ++--
 .../project_messages_view.xml                 | 15 ++++++------
 addons/project_scrum/project_scrum_view.xml   | 21 +++++++++-------
 ...project_scrum_backlog_create_task_view.xml |  4 ++--
 .../project_scrum_backlog_merger_view.xml     |  2 +-
 .../project_scrum_backlog_sprint_view.xml     |  2 +-
 15 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 7e4f9db9eb4..ddeb68c6595 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -10,15 +10,9 @@
           <form position="attributes">
             <attribute name="string">Install Applications</attribute>
           </form>
-<<<<<<< TREE
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</xpath>
-=======
           <xpath expr="//label[@string='description']" position="attributes">
                 <attribute name="string">Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later.</attribute>
           </xpath>
->>>>>>> MERGE-SOURCE
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                     <attribute name='rowspan'>15</attribute>
@@ -29,17 +23,8 @@
           <separator string="title" position="attributes">
             <attribute name="string">Install Applications</attribute>
           </separator>
-            
+
           <group colspan="8">
-<<<<<<< TREE
-            <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="account" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="purchase" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-=======
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="stock" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="mrp" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
@@ -47,17 +32,10 @@
             <field name="hr" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="point_of_sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="marketing" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/> <field name="profile_tools" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="report_designer" groups="base.group_extended" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
->>>>>>> MERGE-SOURCE
             <separator string="Install Specific Industry Sector Applications" colspan="4"/>
-<<<<<<< TREE
-            <field name="association" attrs="{'readonly':['|', ('auction','=',True), ('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="auction" attrs="{'readonly':['|', ('association','=',True), ('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-            <field name="product_expiry" attrs="{'readonly':['|', ('association','=',True), ('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
-=======
             <field name="association" attrs="{'readonly':['|',('auction','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="auction" attrs="{'readonly':['|',('association','=',True),('product_expiry','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
             <field name="product_expiry" attrs="{'readonly':['|',('association','=',True),('auction','=',True)]}" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction,product_expiry)"/>
->>>>>>> MERGE-SOURCE
           </group>
         </data>
       </field>
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index bd10cbcc1d7..0319c69823e 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -3,7 +3,7 @@
     <record model="ir.actions.url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
-    </record> 
+    </record>
 
 
 
@@ -30,13 +30,7 @@
             <group string="res_config_contents" position="replace">
                 <field name="host"/>
             </group>
-<<<<<<< TREE
-           <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-=======
            <xpath expr="//button[@name='action_skip']" position="replace"/>
->>>>>>> MERGE-SOURCE
           </data>
         </field>
     </record>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9db500d93ff..7e17494a5d4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -109,10 +109,10 @@
                     <newline/>
                     <group expand="1" string="Group By..." colspan="10" col="12">
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
-                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
+                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
+                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
diff --git a/addons/project/wizard/project_task_close_view.xml b/addons/project/wizard/project_task_close_view.xml
index 9692fe9a733..4e55d7af1c9 100644
--- a/addons/project/wizard/project_task_close_view.xml
+++ b/addons/project/wizard/project_task_close_view.xml
@@ -8,20 +8,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Done Task" >
-					  <separator string="Done Task and Inform to Project Manager or Customer by Email " colspan="4"/>              		  
+					  <separator string="Done Task and Inform to Project Manager or Customer by Email " colspan="4"/>
               		  <group colspan="4" col="4">
                             <field name="manager_warn" invisible="1"/>
 		                    <field name="manager_email" widget="email" attrs="{'invisible':[('manager_warn','=',False)], 'required':[('manager_warn','=',True)]}"/>
                             <field name="partner_warn" invisible="1"/>
 		                    <field name="partner_email" widget="email" attrs="{'invisible':[('partner_warn','=',False)], 'required':[('partner_warn','=',True)]}"/>
-					        <separator string="Warn Message" colspan="4"/>   
+					        <separator string="Warn Message" colspan="4"/>
 		                    <field name="description" nolabel="1" colspan="4"/>
 		              </group>
 		              <separator string="" colspan="4"/>
                       <group colspan="2" col="2">
-                      </group>  
+                      </group>
 		              <group colspan="2" col="3">
-		            		<button icon="gtk-close" special="cancel" string="_Close"/>
+		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
                             <button  icon="gtk-jump-to" string="_Done" special="cancel" name="done" type="object"/>
 		            		<button  icon="terp-mail-message-new" string="_Send+Done" name="confirm" type="object"/>
 		              </group>
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 7bedecd8f53..a9e4e97b93a 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -15,7 +15,7 @@
 		                    <field name="name" colspan="4"/>
 		                    <field name="new_task_description" colspan="4" />
                       </group>
-                      <group colspan="2" col="2">    
+                      <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
 		                    <field name="planned_hours_me"  widget="float_time" colspan="4"/>
            	                <field name="prefix" colspan="4"/>
@@ -23,9 +23,9 @@
 		              </group>
                       <separator string="" colspan="4"/>
                       <group colspan="2" col="2">
-                      </group>  
+                      </group>
 		              <group colspan="2" col="2">
-		            		<button icon="gtk-close" special="cancel" string="_Close"/>
+		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index 5e0e7c89069..db7bda3afe7 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <record id="view_project_task_reevaluate" model="ir.ui.view">
             <field name="name">Re-evaluate Task</field>
             <field name="model">project.task.reevaluate</field>
@@ -14,7 +14,7 @@
                     <group col="2" colspan="2">
                     </group>
                     <group col="2" colspan="2">
-                        <button icon="gtk-close" special="cancel" string="_Close"/>
+                        <button icon="gtk-close" special="cancel" string="_Cancel"/>
                         <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
                     </group>
                 </form>
diff --git a/addons/project/wizard/project_task_review.xml b/addons/project/wizard/project_task_review.xml
index f1351caec69..5340ef01fbc 100644
--- a/addons/project/wizard/project_task_review.xml
+++ b/addons/project/wizard/project_task_review.xml
@@ -8,15 +8,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
               	<form string="Project Task Review">
-              	<separator string="Review Task " colspan="4"/>            
+              	<separator string="Review Task " colspan="4"/>
                       <group colspan="4">
 		                    <field name="user_id" colspan="4"/>
-			  				<separator string="Remark" colspan="4"/>   
-					  		<newline/>		                    
+			  				<separator string="Remark" colspan="4"/>
+					  		<newline/>
 		                   <field name="description" nolabel="1" colspan="4"/>
                       </group>
 		              <group colspan="4" >
-		            		<button icon="gtk-close" special="cancel" string="Close"/>
+		            		<button icon="gtk-close" special="cancel" string="Cancel"/>
 		            		<button icon="gtk-ok" name="review" string="Review" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ee763b759b6..c85fe37026d 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -60,8 +60,9 @@
                         <field name="phase_id"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20">
+                    <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -184,7 +185,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="5"/>
             <field name="arch" type="xml">
-                <tree string="Project Phases">
+                <tree colors="grey:state in ('cancelled','done');blue:state in ('pending')" string="Project Phases">
                     <field name="name"/>
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
@@ -228,23 +229,26 @@
             <field name="arch" type="xml">
                 <search string="Project Phases">
                     <group colspan="4" col="20">
-                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-check" default="1"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" help="Draft Phases" icon="terp-document-new" default="1"/>
                         <filter string="In Progress" name="Progress" domain="[('state','=','open')]" help="Open Phases" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" help="Pending Phases" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id">
-                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-folder-blue"/>
+                            <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -257,7 +261,7 @@
             <field name="view_mode">tree,form,gantt,calendar</field>
             <field name="context">{'search_default_responsible_id':uid}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
-            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>            
+            <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
 
         <record id="act_project_phase_list" model="ir.actions.act_window">
@@ -320,7 +324,7 @@
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"
-            groups="base.group_extended"  
+            groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 8818684e8fa..e76c86ab60f 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -16,7 +16,7 @@
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2"> <!-- Improve me -->
-	                        <button  icon="gtk-close" special="cancel" string="_Close"/>
+	                        <button  icon="gtk-close" special="cancel" string="_Cancel"/>
 	                        <button icon="gtk-ok" name="check_selection" string="C_ompute" type="object"/>
                         </group>
 		            </group>
diff --git a/addons/project_long_term/wizard/project_compute_tasks_view.xml b/addons/project_long_term/wizard/project_compute_tasks_view.xml
index e0cd30d5622..5a28c4ce00e 100644
--- a/addons/project_long_term/wizard/project_compute_tasks_view.xml
+++ b/addons/project_long_term/wizard/project_compute_tasks_view.xml
@@ -9,13 +9,13 @@
             <field name="arch" type="xml">
               	<form string="Compute Scheduling of Task">
 	                <group colspan="4">
- 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />	                
+ 					    <separator colspan="4" string="Compute Scheduling of Task for specified project." />
                         <field name="project_id" widget="selection" colspan="4"/>
                         <separator colspan="4"/>
                         <group colspan="2" col="2">
                         </group>
                         <group colspan="2" col="2">
-                            <button  icon="gtk-close" special="cancel" string="_Close"/>
+                            <button  icon="gtk-close" special="cancel" string="_Cancel"/>
 		            	    <button icon="gtk-ok" name="compute_date" string="C_ompute" type="object"/>
 		              </group>
 		            </group>
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 7c292f10a7e..bd476e3bc39 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -29,7 +29,7 @@
                	</xpath>
             </field>
        	</record>
-       	
+
        	 <record id="view_project_message_form" model="ir.ui.view">
             <field name="name">project.messages.form</field>
             <field name="model">project.messages</field>
@@ -48,7 +48,7 @@
                 </form>
             </field>
        </record>
-       
+
 		<record id="view_project_message_tree" model="ir.ui.view">
             <field name="name">project.messages.tree</field>
             <field name="model">project.messages</field>
@@ -61,7 +61,7 @@
                 </tree>
             </field>
        	</record>
-       	
+
        	<record id="view_project_messages_search" model="ir.ui.view">
            <field name="name">project.messages.search</field>
            <field name="model">project.messages</field>
@@ -76,13 +76,14 @@
                		<newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                     	<filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
                     </group>
                </search>
            </field>
         </record>
-        
+
        	<record id="messages_form" model="ir.actions.act_window">
             <field name="name">Communication Messages</field>
             <field name="res_model">project.messages</field>
@@ -90,11 +91,11 @@
             <field name="search_view_id" ref="view_project_messages_search"/>
             <field name="context">{"search_default_to_id":uid}</field>
             <field name="view_id" ref="view_project_message_tree"/>
-			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>            
+			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
         </record>
-        
+
         <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
-         
+
          <!--Actions for deshboard -->
 
         <record id="action_view_project_editable_messages_tree" model="ir.actions.act_window">
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index fe995d30103..f6bcc80060f 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -143,17 +143,17 @@
                         <field name="name"/>
                         <field name="project_id"/>
                         <field name="sprint_id" domain="[('state','in',('draft','open'))]">
-                            <filter icon="terp-project"
+                            <filter icon="terp-check"
                                 string="Sprints"
                                 domain="[('sprint_id.state','=','open')]"
                                 help="Backlogs Assigned To Current Sprints"/>
-                            <filter icon="terp-project"
+                            <filter icon="terp-personal-"
                                 string="Sprints"
                                 domain="[('sprint_id','=',False)]"
                                 help="Backlogs Not Assigned To Sprints."/>
                         </field>
                         <field name="user_id">
-                            <filter icon="terp-project"
+                            <filter icon="terp-personal"
                                 string="My Backlogs"
                                 name="my_user_id"
                                 domain="[('user_id','=',uid)]"
@@ -161,16 +161,18 @@
                         </field>
                     </group>
                     <newline/>
+                    <group expand="0" string="Extended Filters..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
-                    <newline/>
-                    <group expand="0" string="Extended Options..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
-                    </group>
                 </search>
             </field>
         </record>
@@ -284,11 +286,13 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Start Date" icon="terp_go_month" domain="[]" context="{'group_by':'date_start'}"/>
                     </group>
                 </search>
             </field>
@@ -375,6 +379,7 @@
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
index 6707a7326d0..ce373beb44f 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task_view.xml
@@ -14,8 +14,8 @@
                 <group col="2" colspan="2">
                 </group>
 			    <group col="2" colspan="2">
-            		<button special="cancel"  string="_Close" icon='gtk-close'/>
-					<button name="do_create" string="Co_nvert" colspan="1" type="object" icon="gtk-execute"/>
+            		<button special="cancel"  string="_Cancel" icon='gtk-close'/>
+					<button name="do_create" string="C_onvert" colspan="1" type="object" icon="gtk-execute"/>
 				</group>
 			</form>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
index a75dcd71d06..c9cdd7423ed 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
@@ -10,7 +10,7 @@
                    <separator string="Are you sure you want to merge these Backlogs?" colspan="4"/>
                    <label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs" />
                    <separator colspan="4"/>
-                   <button colspan="2" special="cancel" string="Close" icon="gtk-close"/>
+                   <button colspan="2" special="cancel" string="Cancel" icon="gtk-close"/>
                    <button colspan="2" default_focus="1" name="check_backlogs" string="Merge" type="object" icon="gtk-execute"/>
                </form>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
index b6c5ea30b42..2d2010d385d 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint_view.xml
@@ -16,7 +16,7 @@
                     <group col="2" colspan="2">
                     </group>
 					<group col="2" colspan="2">
-						<button special="cancel"  string="_Close" icon='gtk-close'/>
+						<button special="cancel"  string="_Cancel" icon='gtk-close'/>
 						<button name="assign_sprint" string="_Assign" colspan="1" type="object" icon="gtk-execute"/>
 					</group>
 				</form>

From 7419a9981c905b1d53f20fd9ebf8884221068e30 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 17:43:18 +0530
Subject: [PATCH 16/71] [IMP]: crm*: Improvement in labels: Name => Contact
 Name, Communication History => History * rename Success Probability ->
 Success Rate (%) * The name of the opportunity proposed must be Partner Name
 instead of the contact name

bzr revid: rpa@tinyerp.com-20100917121318-12qglf1a6dbxssj8
---
 addons/crm/crm_lead_view.xml                            | 4 ++--
 addons/crm/crm_opportunity_view.xml                     | 4 ++--
 addons/crm/crm_view.xml                                 | 4 ++--
 addons/crm/wizard/crm_lead_to_opportunity.py            | 4 ++--
 addons/crm/wizard/crm_opportunity_to_phonecall_view.xml | 2 +-
 addons/crm_claim/crm_claim_view.xml                     | 4 ++--
 addons/crm_fundraising/crm_fundraising_view.xml         | 4 ++--
 addons/crm_helpdesk/crm_helpdesk_view.xml               | 4 ++--
 addons/event/event_view.xml                             | 4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml           | 4 ++--
 addons/project_issue/project_issue_view.xml             | 4 ++--
 addons/project_mailgate/project_mailgate_view.xml       | 4 ++--
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 95f81e0d813..221f043c664 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,7 +55,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Name"/>
+                    <field name="name" required="1" string="Contact Name"/>
                     <field name="priority"/>
                     <field name="categ_id"
                         widget="selection"
@@ -237,7 +237,7 @@
             <tree string="Leads"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
-                <field name="name"/>
+                <field name="name" string="Contact Name"/>
                 <field name="partner_name"/>
                 <field name="country_id" invisible="context.get('invisible_country', True)" />
                 <field name="email_from"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index d5a4963ed66..2dafee6a34c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -128,7 +128,7 @@
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Communication history">
+                                <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -137,7 +137,7 @@
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="Communication history">
+                                <form string="History">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1235bcc095a..133e8d13eeb 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -530,7 +530,7 @@
                                <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
                            </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-		                        <tree string="Communication history">
+		                        <tree string="History">
 		                            <field name="display_text" string="History Information"/>
 		                            <field name="history" invisible="1"/>
 		                            <button
@@ -539,7 +539,7 @@
 		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
 		                                icon="terp-mail-replied" type="action" />
 		                        </tree>
-		                        <form string="Communication history">
+		                        <form string="History">
 		                            <group col="4" colspan="4">
 		                                <field name="email_from"/>
 		                                <field name="date"/>
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 79c833b278c..b02cc1f5197 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -106,7 +106,7 @@ class crm_lead2opportunity(osv.osv_memory):
 
     _columns = {
         'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
-        'probability': fields.float('Success Probability'), 
+        'probability': fields.float('Success Rate (%)'), 
         'planned_revenue': fields.float('Expected Revenue'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
     }
@@ -149,7 +149,7 @@ Leads Could not convert into Opportunity"))
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
         for lead in lead_obj.browse(cr, uid, data, context=context):
             if 'name' in fields:
-                res.update({'name': lead.name})
+                res.update({'name': lead.partner_name})
             if 'partner_id' in fields:
                 res.update({'partner_id': lead.partner_id.id or False})
         return res
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 4d0cf3129f6..3c27eef3d10 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,7 +16,7 @@
                 		<field name="date" string="Planned Date"/>
                 		<newline/>
 						<field name="user_id" />
-						<field name="section_id"/>
+						<field name="section_id" widget="selection" />
 						<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
 						<separator string="" colspan="4"/>
 						<label string ="" colspan="2"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 44b1eb34fd8..9d08b231eeb 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,7 +168,7 @@
                                     <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                                 </group>
                                 <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                    <tree string="Communication history">
+                                    <tree string="History">
                                         <field name="display_text" string="History Information"/>
                                         <button
                                             string="Reply"
@@ -176,7 +176,7 @@
                                             context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
                                             icon="terp-mail-replied" type="action" attrs="{'invisible': [('history', '!=', True)]}" />
                                     </tree>
-                                    <form string="Communication history">
+                                    <form string="History">
                                         <group col="4" colspan="4">
                                             <field name="email_from"/>
                                             <field name="date"/>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 84af1b141c9..dd7c2094f74 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -159,7 +159,7 @@
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Communication history">
+                                <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -168,7 +168,7 @@
                                         context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="Communication history">
+                                <form string="History">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 375b758f9c7..0f657afb895 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -96,7 +96,7 @@
                                 <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Communication history">
+                                <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -105,7 +105,7 @@
                                         context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="Communication history">
+                                <form string="History">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index deb11c14575..352e7a710fd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -371,7 +371,7 @@
                                  <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Communication history">
+                                <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -380,7 +380,7 @@
                                         context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="Communication history">
+                                <form string="History">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ee2221b58c2..6a824570b39 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -148,7 +148,7 @@
                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                        </group>
                        <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                            <tree string="Communication history">
+                            <tree string="History">
                                 <field name="display_text" string="History Information"/>
                                 <field name="history" invisible="1"/>
                                 <button
@@ -157,7 +157,7 @@
                                     context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
                                     icon="terp-mail-replied" type="action" />
                             </tree>
-                            <form string="Communication history">
+                            <form string="History">
                                 <group col="4" colspan="4">
                                     <field name="email_from"/>
                                     <field name="date"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index f3dcca16edc..ac8ffc5b721 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -78,7 +78,7 @@
                             <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                                <tree string="Communication history">
+                                <tree string="History">
                                     <field name="display_text" string="History Information"/>
                                     <field name="history" invisible="1"/>
                                     <button
@@ -87,7 +87,7 @@
                                         context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
                                         icon="terp-mail-replied" type="action" />
                                 </tree>
-                                <form string="Communication history">
+                                <form string="History">
                                     <group col="4" colspan="4">
                                         <field name="email_from"/>
                                         <field name="date"/>
diff --git a/addons/project_mailgate/project_mailgate_view.xml b/addons/project_mailgate/project_mailgate_view.xml
index b31eb85328e..8c8816ebbd5 100644
--- a/addons/project_mailgate/project_mailgate_view.xml
+++ b/addons/project_mailgate/project_mailgate_view.xml
@@ -8,9 +8,9 @@
 		            <field name="inherit_id" ref="project.view_task_form2"/>
 		            <field name="arch" type="xml">
 		                <xpath expr="/form/notebook/page[@string='Extra Info']" position="before">
-		                    <page string="Communication History">
+		                    <page string="History">
 	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-			                        <tree string="Communication history">
+			                        <tree string="History">
 			                            <field name="display_text" string="History Information"/>
 			                        </tree>
 			                        <form string="History">

From a8cdbfcb83135a4a14cd22e0f45095bef4ceb753 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 18:17:21 +0530
Subject: [PATCH 17/71] [IMP]: crm: Improvement in leads view to add history
 manually

bzr revid: rpa@tinyerp.com-20100917124721-w2f2muv6xlq3922s
---
 addons/crm/crm_lead_view.xml        | 51 +++++++++++++----------------
 addons/mail_gateway/mail_gateway.py | 32 +++++++++---------
 2 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 221f043c664..9ca88341619 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -168,41 +168,36 @@
                     </group>
                  </page>
                  <page string="History" groups="base.group_extended">
-                   <group colspan="4">
-                       <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
-                   </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
-                        <tree string="Communication history">
+                    <group colspan="4">
+                        <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                    </group>
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" context="{'default_model': 'crm.lead', 'default_user_id': uid}" >
+                        <tree string="History">
                             <field name="display_text" string="History Information"/>
                             <field name="history" invisible="1"/>
-                            <button
-                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
-                                name="%(crm.action_crm_send_mail)d"
-                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                icon="terp-mail-replied" type="action" />
+                            <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" name="123" context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}" icon="terp-mail-replied" type="action"/>
                         </tree>
-                        <form string="Communication history">
-                            <group col="4" colspan="4">
-                                <field name="email_from"/>
-                                <field name="date"/>
-                                <field name="email_to" widget="char" size="512"/>
-                                <field name="email_cc" widget="char" size="512"/>
-                                <field name="name" colspan="4" widget="char" size="512"/>
-                                <field name="history" invisible="1"/>
-                            </group>
+                        <form string="History">
+                            <field name="history"/>
+                            <field name="name" colspan="4" widget="char" size="512" required="1"/>
+                            <field name="date" required="1"/>
+                            <field name="user_id"/>
+                            <field name="model" invisible="1"/>
                             <notebook colspan="4">
                                 <page string="Details">
-                                    <group attrs="{'invisible': [('history', '!=', True)]}">
-                                        <field name="description" colspan="4" nolabel="1" height="250"/>
-                                        <button colspan="4"
-                                            string="Reply"
-                                            name="%(crm.action_crm_send_mail)d"
-                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                            icon="terp-mail-replied" type="action" />
+                                    <group col="4" colspan="4" attrs="{'invisible': [('history', '!=', True)]}">
+                                        <field name="email_from" attrs="{'required': [('history', '=', True)]}"/>
+                                        <field name="email_to" widget="char" size="512"  attrs="{'required': [('history', '=', True)]}"/>
+                                        <field name="email_cc" widget="char" size="512"/>
                                     </group>
-                                    <group attrs="{'invisible': [('history', '=', True)]}">
-                                        <field name="display_text" colspan="4" nolabel="1"  height="250"/>
+                                    <separator string="Description" colspan="4"/>
+                                     <group colspan="4" attrs="{'invisible': [('history', '!=', True)]}">
+                                        <field name="description" colspan="4" nolabel="1" attrs="{'required': [('history', '=', True)]}"/>
                                     </group>
+                                    <group colspan="4" attrs="{'invisible': [('history', '=', True)]}">
+                                        <field name="display_text" colspan="4" nolabel="1"/>
+                                    </group>
+                                    <button colspan="4" string="Reply" name="123" context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}" icon="terp-mail-replied" type="action"/>
                                 </page>
                                 <page string="Attachments">
                                     <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index c8d75a3a873..98a03564785 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -214,23 +214,23 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'date desc'
     _columns = {
-        'name':fields.text('Subject', readonly=True),
-        'model': fields.char('Object Name', size=128, select=1, readonly=True),
-        'res_id': fields.integer('Resource ID', select=1, readonly=True),
-        'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date', readonly=True),
-        'history': fields.boolean('Is History?', readonly=True),
-        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
-        'message': fields.text('Description', readonly=True),
-        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
-        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
-        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
-        'references': fields.text('References', readonly=True, help="References emails."),
-        'description': fields.text('Description', readonly=True),
+        'name':fields.text('Subject'),
+        'model': fields.char('Object Name', size=128, select=1),
+        'res_id': fields.integer('Resource ID', select=1),
+        'ref_id': fields.char('Reference Id', size=256, help="Message Id in Email Server.", select=True),
+        'date': fields.datetime('Date'),
+        'history': fields.boolean('Is History?'),
+        'user_id': fields.many2one('res.users', 'User Responsible'),
+        'message': fields.text('Description'),
+        'email_from': fields.char('From', size=128, help="Email From"),
+        'email_to': fields.char('To', help="Email Recipients", size=256),
+        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
+        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
+        'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
+        'references': fields.text('References', help="References emails."),
+        'description': fields.text('Description'),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
         'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
     }
 

From 802a39560c5be73774127c464034614df4ec61e2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 18:19:46 +0530
Subject: [PATCH 18/71] [IMP]: crm: Improvement in leads search view for oder
 of "Group by" and "Extended Options"

bzr revid: rpa@tinyerp.com-20100917124946-s35be0mb90pzypf0
---
 addons/crm/crm_lead_view.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9ca88341619..7783c7be1b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -333,19 +333,6 @@
                         help="Show Sales Team"/>
                 </field>
                 <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Creation" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" />
-                </group>
-                <newline/>
                 <group  expand="0" string="Extended Filters..." groups="base.group_extended">
                       <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
                       <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
@@ -359,6 +346,19 @@
                       <field name="create_date" string="Creation Date"/>
                       <field name="date_closed"/>
                 </group>
+                <newline/>
+                <group expand="0" string="Group By...">
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Creation" icon="terp-go-month"
+                        domain="[]" context="{'group_by':'create_date'}" />
+                </group>
            </search>
         </field>
     </record>

From 2db557674887049e9f40f1361b62848e0e31bc41 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 19:03:13 +0530
Subject: [PATCH 19/71] [IMP]: crm: Improvement in order of "Group by" and
 "Extended Options" in opportunity search view

bzr revid: rpa@tinyerp.com-20100917133313-muwci8k3vnuzv99d
---
 addons/crm/crm_opportunity_view.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 2dafee6a34c..632cb2510c8 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -323,6 +323,20 @@
                                 help="Show Sales Team"/>
                         </field>
                         <newline/>
+                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
+                              <separator orientation="vertical"/>
+                              <field name="country_id" context="{'invisible_country': False}">
+                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
+                              </field>
+                              <separator orientation="vertical"/>
+                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                              <newline/>
+                              <field name="create_date" string="Creation Date"/>
+                              <field name="date_closed"/>
+                        </group>
+                        <newline/>
                         <group expand="0" string="Group By..." colspan="16">
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
@@ -345,20 +359,6 @@
                                 help="Expected Closing" domain="[]"
                                 context="{'group_by':'date_deadline'}" />
                         </group>
-                        <newline/>
-                        <group  expand="0" string="Extended Filters..." groups="base.group_extended">
-                              <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>
-                              <separator orientation="vertical"/>
-                              <field name="country_id" context="{'invisible_country': False}">
-                                  <filter icon="terp-personal+" context="{'invisible_country': False}" help="Show countries"/>
-                              </field>
-                              <separator orientation="vertical"/>
-                              <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                              <newline/>
-                              <field name="create_date" string="Creation Date"/>
-                              <field name="date_closed"/>
-                        </group>
                     </search>
                 </field>
             </record>

From bca5306f3037b1608b4bdcd586bda56550513c85 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 19:05:06 +0530
Subject: [PATCH 20/71] [IMP]: crm: Added act_window in Opportunity for merge
 opportunity wizard

bzr revid: rpa@tinyerp.com-20100917133506-5rqff1wlpeepfd96
---
 addons/crm/wizard/crm_merge_opportunities_view.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index b6af1f27e8e..cf1a7ee09a4 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -34,5 +34,10 @@
             <field name="target">new</field>
         </record>
 
+        <act_window id="action_merge_opportunities"
+            key2="client_action_multi" name="Merge Opportunities"
+            res_model="crm.merge.opportunity" src_model="crm.lead"
+            view_mode="form" target="new" view_type="form" />
+
     </data>
 </openerp>
\ No newline at end of file

From 2f9a1347ccab3c9e044adcafb2ebf4c60218100d Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 19:06:17 +0530
Subject: [PATCH 21/71] [IMP]: sale_crm: Fixed partner address and default valu
 in Make sale wizard

bzr revid: rpa@tinyerp.com-20100917133617-0qm90sn2wdpow8wu
---
 addons/sale_crm/wizard/crm_make_sale.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 9d20b0dea4a..e69416f1d25 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -98,7 +98,7 @@ class crm_make_sale(osv.osv_memory):
                     partner_id = case.partner_id.id
                     fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
                     partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
-                            ['invoice', 'delivery', 'contact'])
+                            ['default', 'invoice', 'delivery', 'contact'])
                     pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
                             context).property_product_pricelist.id
                 else:
@@ -198,7 +198,6 @@ class crm_make_sale(osv.osv_memory):
     _defaults = {
          'shop_id': _get_shop_id,
          'partner_id': _selectPartner,
-         'close': 1
     }
 
 crm_make_sale()

From 4dc83dd64ffe6cd0a249c8e49b635e3c05a336de Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 19:12:13 +0530
Subject: [PATCH 22/71] [REM]: crm: Removed the Meetings right toolbar action
 on phonecalls

bzr revid: rpa@tinyerp.com-20100917134213-389eu4l58k3xo9n3
---
 addons/crm/crm_phonecall_menu.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 481e92ec134..8585ddc7fe4 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -13,7 +13,8 @@
         groups="base.group_extended"
         />
 
-    <act_window
+    <!-- TO CONFIRM: This is fine -->
+    <!-- act_window
             id="act_crm_phonecall_crm_meeting_new"
             name="Meetings"
             res_model="crm.meeting"
@@ -21,7 +22,7 @@
             view_mode="tree,form,calendar,"
             context="{'default_duration': 4.0, 'default_phonecall_id': active_id}"
             domain="[('phonecall_id', '=', active_id)]"
-            view_type="form"/>
+            view_type="form"/-->
 
 <!-- PHONE CALLS (menu)  -->
 

From ef788a01ed8a27e2395ceb8b357a58449cd2431f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Fri, 17 Sep 2010 19:16:43 +0530
Subject: [PATCH 23/71] [IMP]: crm: Added the button Schedule Another Call in
 the list of inbound phonecalls

bzr revid: rpa@tinyerp.com-20100917134643-2z0br0syxjb90uzv
---
 addons/crm/crm_phonecall_view.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 652e17df061..ae243b8cfb0 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -221,6 +221,10 @@
                 	string="Type" />
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
+                <button string="Schedule Other Call"
+                    icon="terp-call-start"
+                    name="%(phonecall_to_phonecall_act)d"
+                    type="action"  />
                 <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"

From 23f1d3d6af2555b551e378d93367350a36eba59d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Sat, 18 Sep 2010 10:53:21 +0530
Subject: [PATCH 24/71] [IMP] sale and sale_* modules:-useability improvements

bzr revid: mtr@mtr-20100918052321-s0oog2xkaclltknd
---
 addons/sale/report/sale_report_view.xml       | 48 +++++++---------
 addons/sale/sale.py                           |  6 +-
 addons/sale/sale_view.xml                     | 57 +++++++++++--------
 addons/sale/security/ir.model.access.csv      |  2 +-
 addons/sale_journal/sale_journal_view.xml     | 35 +++++++-----
 .../sale_journal/security/ir.model.access.csv |  1 +
 addons/sale_margin/sale_margin_view.xml       |  5 +-
 .../sale_order_dates_view.xml                 |  6 +-
 8 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 36b1afee891..46fa68e0eac 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -51,23 +51,23 @@
         <field name="arch" type="xml">
             <search string="Sales Analysis">
                 <group>
-                    <filter icon="terp-go-year" string="  365 Days  "
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 365 days"/>
-                    <filter icon="terp-go-month" string="   30 Days   "
+                    <filter icon="terp-go-year" string="  Year  "
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Sales order created in last 365 days"/>
+                    <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-                        help="Tasks performed in last 30 days"/>
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                        help="Sales order created in last 30 days"/>
                     <filter icon="terp-go-week"
-                         string="    7 Days    "
+                         string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                         help="Tasks during last 7 days"/>
+                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Sales order created in last month"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
                         string="Quotations"
                         domain="[('state','=','draft')]"/>
-                    <filter icon="terp-dolar"
+                    <filter icon="terp-check"
                         string="Sales"
                         domain="[('state','not in',('draft','done','cancel'))]"/>
                     <separator orientation="vertical"/>
@@ -77,7 +77,7 @@
                     <separator orientation="vertical"/>
                     <field name="partner_id"/>
                     <field name="product_id"/>
-                    <field name="user_id" widget="selection">
+                    <field name="user_id">
                         <filter icon="terp-personal"
                             string="My Sales"
                             help="My Sales"
@@ -92,6 +92,7 @@
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
@@ -99,18 +100,18 @@
                     <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <separator orientation="vertical"/>
-                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                   <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
+                   <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
+                   <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="shop_id"/>
+                    <field name="categ_id" widget="selection"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
                     <field name="date"/>
                     <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
-                    <field name="shop_id" widget="selection"/>
-                    <field name="categ_id" widget="selection"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 </group>
             </search>
         </field>
@@ -130,17 +131,6 @@
     <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11"/>
     <menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1"/>
 
-    <record id="action_stock_move_report_so" model="ir.actions.act_window">
-        <field name="name">Shipments Analysis</field>
-        <field name="res_model">report.stock.move</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_month':1, 'search_default_group_product':1, 'search_default_group_partner':1, 'search_default_done':1, 'search_default_out': 1, 'group_by':[], 'group_by_no_leaf':1}</field>
-        <field name="help">Shipments Analysis opens a search views with all your shipments (in and out quantities), their total value, planned and actual dates. You can sort out your analysis on different groups to get fine grained analysis.</field>
-    </record>
-    <menuitem action="action_stock_move_report_so" id="menu_action_stock_move_report_so" parent="base.next_id_64" sequence="25"/>
-
-
     <!--This views used in board_sale module -->
     <record id="view_sales_by_partner_tree" model="ir.ui.view">
         <field name="name">sales.by.partner.tree</field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b2df12965d3..47d5a635048 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -247,7 +247,7 @@ class sale_order(osv.osv):
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
-        'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available it generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
+        'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available Procurement generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, method=True, string='Paid',
@@ -273,10 +273,10 @@ class sale_order(osv.osv):
             },
             multi='sums', help="The total amount"),
 
-        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
+        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.many2one('res.company','Company')
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 327a10aa6d8..d81a127f0ea 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -15,7 +15,7 @@
                 <form string="Sale Shop">
                     <field name="name" select="1"/>
                     <field name="warehouse_id" required="1" select="1" widget="selection"/>
-                    <field name="company_id" widget='selection'/>
+                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     <separator colspan="4" string="Accounting"/>
                     <field name="payment_default_id"/>
                     <field domain="[('type','=','sale')]" name="pricelist_id" select="1"/>
@@ -78,7 +78,7 @@
             <field name="model">sale.order</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Sales orders">
+                <tree string="Sales orders" colors="grey:state=='done'">
                     <field name="name"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
@@ -204,10 +204,10 @@
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
+                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="manual_invoice" states="manual" string="Create Invoice" icon="terp-document-new"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
                             </group>
@@ -268,12 +268,12 @@
                     </field>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                </search>
             </field>
@@ -373,28 +373,33 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order Lines">
+                    <separator colspan="4" string="General Information"/>
+				    <group colspan="4" col="6">
+						<field name="order_id"/>
+						<field name="product_id" readonly="1"/>
+						<field name="invoiced"/>
+						<field name="product_uom_qty" readonly="1"/>
+						<field groups="product.group_uos" name="product_uos_qty"/>
+						<field name="product_uom"/>
+						<field name="company_id" groups="base.group_multi_company" readonly="1"/>
+						<field name="order_partner_id" readonly="1" invisible="1"/>
+				    </group>
                     <notebook>
                         <page string="Order Lines">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="order_id"/>
-                            <field name="order_partner_id" readonly="1" invisible="1"/>
-                            <field name="product_uom_qty" readonly="1"/>
-                            <field groups="product.group_uos" name="product_uos_qty"/>
-                            <field name="product_uom"/>
-                            <field name="product_id" readonly="1"/>
-                            <field name="invoiced"/>
-                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                             <separator colspan="4" string="Manual Designation"/>
-                            <field colspan="4" name="name" groups="base.group_extended"/>
-                            <field name="price_unit"/>
-                            <field name="discount"/>
+                            <group colspan="4" col="6">
                             <field name="type" groups="base.group_extended"/>
                             <field name="delay" groups="base.group_extended"/>
-                            <field name="price_subtotal"/>
                             <field name="th_weight" groups="base.group_extended"/>
+                            <field name="price_unit"/>
+                            <field name="discount"/>
+                            <field name="price_subtotal"/>
+                            </group>
+                            <separator colspan="4" string="Description"/>
+                            <field colspan="4" name="name" groups="base.group_extended"/>
                             <separator colspan="4" string="Taxes"/>
                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
-                            <separator colspan="4" string="States"/>
+                            <separator colspan="4"/>
                             <field name="state"/>
                             <group col="3" colspan="2">
                                 <button colspan="1"
@@ -455,6 +460,12 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Uninvoiced Lines">
+                    <filter icon="terp-check" string="Confirmed"
+                        domain="[('state','=','confirmed')]"
+                        name="sale order"
+                        help="Confirmed Sale Order Lines"
+                        />
+                    <separator orientation="vertical"/>    
                     <filter icon="terp-accessories-archiver" string="Shipped"
                         domain="[('state','=','done')]"
                         name="unshipped"
@@ -464,11 +475,6 @@ to your configuration: from the sales order, from the pickings, etc.
                         domain="[('invoiced','&lt;&gt;', 1),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]"
                         help="Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
                         />
-                    <filter icon="terp-check" string="Confirmed"
-                        domain="[('state','=','confirmed')]"
-                        name="sale order"
-                        help="Confirmed Sale Order Lines"
-                        />
                     <separator orientation="vertical"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
@@ -478,8 +484,9 @@ to your configuration: from the sales order, from the pickings, etc.
                     </field>
                     <newline />
                     <group expand="0" string="Group By..." colspan="9" col="8">
+                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}" help="Order reference"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'order_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 89a2003698c..d7bf15d8e18 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -13,7 +13,7 @@
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,0,0,0
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
+"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
 "access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index f70f3ad9299..90a4f8c855c 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -12,11 +12,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice Type">
+                    <group colspan="4" col="6">
                     <field name="name" select="1"/>
-                    <field name="active" select="1"/>
                     <field name="invoicing_method" select="1"/>
-                    <newline/>
-                    <field name="note" colspan="4"/>
+                    <field name="active" select="1"/>
+                    </group>
+                     <notebook>
+                        <page string="Notes">
+                            <field name="note" colspan="2" nolabel="1"/>
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -80,9 +85,9 @@
                     </notebook>
                     <field name="state"/>
                         <group col="6" colspan="2">
-                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-                            <button string="Confirm Sales" name="button_sale_confirm" states="open" type="object" icon="gtk-execute"/>
-                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="gtk-close"/>
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
+                            <button string="Confirm Sales" name="button_sale_confirm" states="open" type="object" icon="terp-camera_test"/>
+                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
                             <button name="button_draft" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
                             <button string="Cancel Sales" name="button_sale_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
                         </group>
@@ -117,10 +122,10 @@
                 <search string="Sales by Journal">
                     <group col="8" colspan="4">
 						<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Sales Journal which are in draft state"/>
-                        <filter icon="gtk-open" string="Open" domain="[('state','=','open')]" help="Open Sales Journal"/>
+                        <filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Sales Journal"/>
+                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirmed Sales Journal"/>
                         <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Sales Journal which are cancelled"/>
-                        <filter icon="terp-check" string="Confirm" domain="[('state','=','confirm')]" help="Confirmed Sales Journal"/>
-                        <filter icon="terp-camera_test" string="Close" domain="[('state','=','done')]" help="Sales Journal which are closed"/>
+                        <filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Sales Journal which are closed"/>
                        <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
@@ -142,7 +147,7 @@
         </record>
 
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70" />
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70" groups="base.group_sale_salesman"/>
 
     <!-- Inherit sales order form view -->
 
@@ -394,10 +399,10 @@
                     </notebook>
                     <field name="state"/>
                         <group col="6" colspan="2">
-                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
-                            <button string="Confirm Picking" name="button_picking_confirm" states="open" type="object" icon="gtk-execute"/>
+                            <button name="button_open" string="Open Journal" states="draft" type="object" icon="terp-check"/>
+                            <button string="Confirm Picking" name="button_picking_confirm" states="open" type="object" icon="terp-camera_test"/>
                             <button name="button_reset" string="Set to Draft" states="cancel" type="object" icon="gtk-convert"/>
-                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="gtk-close"/>
+                            <button name="button_close" string="Close Journal" states="confirm,open" type="object" icon="terp-dialog-close"/>
                             <button string="Cancel Picking" name="button_picking_cancel" states="close,draft,open,confirm" type="object" icon="gtk-cancel"/>
                         </group>
                 </form>
@@ -429,9 +434,9 @@
                 <search string="Picking Journals">
                     <group col="8" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Picking Journals which are in draft state"/>
-					   	<filter icon="gtk-open" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
+					   	<filter icon="terp-check" string="Open" domain="[('state','=','open')]" help="Open Picking Journals"/>
 					   	<filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Picking Journals which are cancelled"/>
-					   	<filter icon="terp-camera_test" string="Close" domain="[('state','=','done')]" help="Picking Journals which are closed"/>
+					   	<filter icon="terp-dialog-close" string="Close" domain="[('state','=','done')]" help="Picking Journals which are closed"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="code"/>
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
index 8b1f5b41f41..645ee5bd534 100644
--- a/addons/sale_journal/security/ir.model.access.csv
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_sale_journal_invoice_type_finance_invoice","sale_journal.invoice.type invoice","model_sale_journal_invoice_type","account.group_account_invoice",1,0,0,0
 "access_sale_journal_invoice_type_partner_manager","sale_journal.invoice.type partner manager","model_sale_journal_invoice_type","base.group_partner_manager",1,0,0,0
+"access_sale_journal_invoice_type_salesman","sale_journal.invoice.type salesman","model_sale_journal_invoice_type","base.group_sale_salesman",1,0,0,0
 "access_sale_journal_sale_journal","sale_journal.sale.journal","model_sale_journal_sale_journal","base.group_sale_salesman",1,0,0,0
 "access_sale_journal_invoice_type_manager","sale_journal.invoice.type.manager","model_sale_journal_invoice_type","base.group_sale_manager",1,1,1,1
 "access_sale_journal_sale_journal_manager","sale_journal.sale.journal.manager","model_sale_journal_sale_journal","base.group_sale_manager",1,1,1,1
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index e8f3e12a720..47cbe4c2878 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -69,16 +69,15 @@
 		<field name="model">stock.picking</field>
 		<field name="inherit_id" ref="stock.view_picking_out_form" />
 		<field name="arch" type="xml">
-			<notebook colspan="4">
+		<xpath expr="/form/notebook/page[@string='Additional info']" position="after">
 			<page string="Customer Invoices">
-					<separator string="Invoices" colspan="4"/>
                     <field colspan="4" name="invoice_ids" nolabel="1"/>
 					<group col="10" colspan="4">
 						<label colspan="6"/>
 						<button name="create_invoice" icon='gtk-execute' string="Create Invoice" type="object"/>	
 					</group>
             </page>	
-			</notebook>		
+		</xpath>
 		</field>
 	</record>
 	
diff --git a/addons/sale_order_dates/sale_order_dates_view.xml b/addons/sale_order_dates/sale_order_dates_view.xml
index 54248fa0176..5bb53fe52ce 100644
--- a/addons/sale_order_dates/sale_order_dates_view.xml
+++ b/addons/sale_order_dates/sale_order_dates_view.xml
@@ -8,14 +8,14 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
+                <field name="create_date" position="after">
+                    <field name="requested_date"/>
+                </field>
                 <field name="date_confirm" position="after">
                     <field name="commitment_date"/>
                     <field name="effective_date"/>
-                    <field name="requested_date"/>
                 </field>
             </field>
         </record>
-
-
     </data>
 </openerp>

From 050344d175dc19e6b3cfa306bb2c01ddc977100a Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Sat, 18 Sep 2010 11:22:11 +0530
Subject: [PATCH 25/71] [IMP]: Usability Improvements

bzr revid: rvo@tinyerp.co.in-20100918055211-3kuyw3k8nagxvb7t
---
 addons/project/project.py                     | 12 +++--
 addons/project_long_term/project_long_term.py |  7 +++
 .../project_long_term_view.xml                |  8 ++--
 .../project_messages_view.xml                 |  6 +--
 addons/project_scrum/project_scrum_view.xml   | 46 +++++++++----------
 addons/resource/resource.py                   |  8 ++++
 addons/resource/resource_view.xml             |  6 ++-
 7 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 0b9584655a8..a746f88cfb8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -389,6 +389,8 @@ class task(osv.osv):
         if not default.get('remaining_hours', False):
             default['remaining_hours'] = float(self.read(cr, uid, id, ['planned_hours'])['planned_hours'])
         default['active'] = True
+        if not default.get('name', False):
+            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
         return super(task, self).copy_data(cr, uid, id, default, context)
 
     def _check_dates(self, cr, uid, ids, context=None):
@@ -397,7 +399,7 @@ class task(osv.osv):
              if task['date_start'] > task['date_end']:
                  return False
         return True
-    
+
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for task in self.browse(cr, uid, ids, context=context):
@@ -453,15 +455,15 @@ class task(osv.osv):
     }
 
     _order = "sequence, priority, date_start, id"
-    
+
     def _check_recursion(self, cr, uid, ids):
         obj_task = self.browse(cr, uid, ids[0])
         parent_ids = [x.id for x in obj_task.parent_ids]
         children_ids = [x.id for x in obj_task.child_ids]
-        
+
         if (obj_task.id in children_ids) or (obj_task.id in parent_ids):
             return False
-        
+
         while(ids):
             cr.execute('SELECT DISTINCT task_id '\
                        'FROM project_task_parent_rel '\
@@ -535,7 +537,7 @@ class task(osv.osv):
                         'ref_doc1': 'project.task,%d'% (task.id,),
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
-                
+
             for parent_id in task.parent_ids:
                 if parent_id.state in ('pending','draft'):
                     reopen = True
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 79baff679cc..b795dda557e 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -214,6 +214,13 @@ class project_phase(osv.osv):
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
         return super(project_phase, self).write(cr, uid, ids, vals, context=context)
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if not default.get('name', False):
+            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+        return super(project_phase, self).copy(cr, uid, id, default, context)
+
     def set_draft(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state': 'draft'})
         return True
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c85fe37026d..ae5b2600092 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -242,13 +242,13 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
+                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Start Month"/>
                     </group>
                 </search>
             </field>
@@ -259,7 +259,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,gantt,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="context">{'search_default_responsible_id':uid, 'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index bd476e3bc39..2689e2fd7c5 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -38,7 +38,6 @@
                 <form string="Messages">
                 	<group attrs="{'readonly':[('from_id', '!=', uid)]}">
                         <field name="project_id" select="1" domain="[('user_id','=',uid)]"/>
-                        <newline/>
                         <field name="from_id" select="1"/>
                         <field name="to_id" select="1"/>
                         <newline/>
@@ -72,13 +71,14 @@
                			<field name="project_id"/>
                         <field name="from_id"/>
                         <field name="to_id"/>
+                        <field name="message"/>
                		</group>
                		<newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                    	<filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Message To" icon="terp-personal" domain="[]" context="{'group_by':'to_id'}"/>
                         <filter string="Message From" icon="terp-personal" domain="[]" context="{'group_by':'from_id'}"/>
+                        <separator orientation="vertical"/>
+                    	<filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                     </group>
                </search>
            </field>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index f6bcc80060f..b8997d7ebb0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -40,13 +40,14 @@
                     <field name="sprint_id"/>
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar"/>
-                    <field name="expected_hours" sum="Planned hours" widget="float_time"/>
-                    <field name="effective_hours" sum="Effective hours" widget="float_time"/>
+                    <field name="expected_hours" sum="Planned hours" widget="float_time" string="Total Planned Hours"/>
+                    <field name="effective_hours" sum="Effective hours" widget="float_time" string="Total Spent Hours"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-execute"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="terp-stock_effects-object-colorize"/>
+                    <button type="action" string="Merge Backlogs" name="%(action_scrum_backlog_merge)d" states="pending" icon="terp-stock_effects-object-colorize"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                 </tree>
             </field>
         </record>
@@ -102,22 +103,22 @@
                                             help="Change Type"/>
                                         <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                                         <field name="state" invisible="context.get('set_visible',False)"/>
-                                        <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                                        <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state"/>
+                                        <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+                                        <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
                                         <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
-                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
+                                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera-test"/>
                         <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
                         <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-cancel"/>
+                        <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                     </group>
                 </form>
             </field>
@@ -135,10 +136,12 @@
                             string="Current"
                             name="current"
                             domain="['|','&amp;',('sprint_id.date_start','&lt;=',time.strftime('%%Y-%%m-%%d')), ('sprint_id.date_stop','&gt;=',time.strftime('%%Y-%%m-%%d')), ('state','in',['draft','open','pending'])]"
-                            help="Current Backlogs"/>
+                            help="Draft, Open and Pending Backlogs"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Backlogs"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Backlogs"/>
+                        <filter icon="terp-document-new" string="Pending" domain="[('state','=','pending')]" help="Pending Backlogs"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id"/>
@@ -161,16 +164,12 @@
                         </field>
                     </group>
                     <newline/>
-                    <group expand="0" string="Extended Filters..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Editable" icon="terp-folder-blue" domain="[]" context="{'set_editable':'1'}"/>
-                    </group>
-                    <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
@@ -181,7 +180,7 @@
             <field name="name">Product Backlogs</field>
             <field name="res_model">project.scrum.product.backlog</field>
             <field name="view_type">form</field>
-            <field name="context">{'search_default_current': 1}</field>
+            <field name="context">{'search_default_current': 1,'search_default_user_id':uid,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_product_backlog_search"/>
         </record>
         <menuitem
@@ -308,7 +307,7 @@
             <field name="search_view_id" ref="view_scrum_sprint_search"/>
         </record>
         <menuitem
-            sequence="30"
+            sequence="20"
             action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="menu_scrum"/>
 
         <!--
@@ -323,6 +322,7 @@
                 <tree string="Scrum Sprint">
                     <field name="date"/>
                     <field name="sprint_id"/>
+                    <field name="project_id"/>
                 </tree>
             </field>
         </record>
@@ -380,7 +380,7 @@
                     <group expand="0" string="Group By..." colspan="4" col="20">
                         <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Meeting Date"/>
                     </group>
                 </search>
             </field>
@@ -391,10 +391,10 @@
             <field name="res_model">project.scrum.meeting</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_scrum_daily':1}</field>
+            <field name="context">{'search_default_scrum_daily':1,'search_default_project_id':project_id}</field>
             <field name="search_view_id" ref="view_scrum_meeting_search"/>
         </record>
-        <menuitem sequence="20"
+        <menuitem sequence="30"
             action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/>
 
         <!--
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index d31511e33e5..a3cd66d219a 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -218,6 +218,14 @@ class resource_resource(osv.osv):
             args.append(('user_id','in',user_ids))
 
         return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        if not default.get('name', False):
+            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+        return super(resource_resource, self).copy(cr, uid, id, default, context)
+
 resource_resource()
 
 class resource_calendar_leaves(osv.osv):
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 02b9abd882a..0c881f081c1 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -18,9 +18,11 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
                         <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'resource_type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     </group>
                </search>
             </field>

From 558352fba2af69a1015ec9a4c7bad90cc6683b4a Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Sat, 18 Sep 2010 11:37:11 +0530
Subject: [PATCH 26/71] [IMP] sale,sale_journal:-changes in user rights and
 groups assignment in sale journal

bzr revid: mtr@mtr-20100918060711-0twyw1el2f4wxb6g
---
 addons/sale/security/ir.model.access.csv  | 2 +-
 addons/sale_journal/sale_journal_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index d7bf15d8e18..89a2003698c 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -13,7 +13,7 @@
 "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
 "access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,0,0,0
-"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1
+"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0
 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1
 "access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1
 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 90a4f8c855c..966f6307e5e 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -147,7 +147,7 @@
         </record>
 
 
-        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70" groups="base.group_sale_salesman"/>
+        <menuitem id="menu_definition_journal" name="Sales Journals" parent="menu_sale_journal_config"  action="action_definition_journal" sequence="70"/>
 
     <!-- Inherit sales order form view -->
 

From 7934430265dce61e4cfed841b111a0628388c6ef Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Sat, 18 Sep 2010 12:42:47 +0530
Subject: [PATCH 27/71] [IMP]: Usability Improvements

bzr revid: rvo@tinyerp.co.in-20100918071247-tulwaj04sf1pxb6z
---
 .../project_messages_view.xml                 |  1 +
 addons/project_scrum/project_scrum.py         |  3 ++-
 addons/project_scrum/project_scrum_view.xml   | 25 ++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 2689e2fd7c5..6780da6c694 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -38,6 +38,7 @@
                 <form string="Messages">
                 	<group attrs="{'readonly':[('from_id', '!=', uid)]}">
                         <field name="project_id" select="1" domain="[('user_id','=',uid)]"/>
+                        <newline/>
                         <field name="from_id" select="1"/>
                         <field name="to_id" select="1"/>
                         <newline/>
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index a80a31ff257..652da446342 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -318,7 +318,8 @@ class project_scrum_meeting(osv.osv):
         'question_today': fields.text('Tasks for today'),
         'question_blocks': fields.text('Blocks encountered'),
         'question_backlog': fields.text('Backlog Accurate'),
-        'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks')
+        'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks'),
+        'responsible_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Responsible'),
     }
     #
     # TODO: Find the right sprint thanks to users and date
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index b8997d7ebb0..4d88aae05c0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -113,10 +113,10 @@
                     </notebook>
                     <group col="8" colspan="4">
                         <field name="state" select="1" readonly="1"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera-test"/>
+                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                         <button type="object" string="Cancel" name="button_cancel" states="open,pending" icon="gtk-stop"/>
                     </group>
@@ -208,9 +208,9 @@
                     <field name="effective_hours" sum="Effective hours" widget="float_time"/>
                     <field name="expected_hours" sum="Planned hours" widget="float_time"/>
                     <field name="state"/>
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-execute"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                     <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                     <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                 </tree>
             </field>
@@ -228,7 +228,7 @@
                     <notebook colspan="4">
                         <page string="Sprint Info">
                             <group colspan="2" col="2">
-                                <separator string="Owners" colspan="2"/>
+                                <separator string="Responsible" colspan="2"/>
                                 <field name="product_owner_id"/>
                                 <field name="scrum_master_id"/>
                             </group>
@@ -256,9 +256,9 @@
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state" readonly="1"/>
-                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
                         <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                        <button type="object" string="Close" name="button_close" states="open,pending" icon="gtk-jump-to"/>
+                        <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
                         <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
                     </group>
                 </form>
@@ -274,8 +274,8 @@
                     <group col="10" colspan="4">
                         <filter name="terp-check" icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]" help="Draft and open Sprints"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Sprints"/>
                         <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Open Sprints"/>
+                        <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Sprints"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="project_id"/>
@@ -284,14 +284,14 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
                         <filter string="Product owner" icon="terp-personal" domain="[]" context="{'group_by':'product_owner_id'}"/>
+                        <filter string="Managers" icon="terp-personal" domain="[]"  context="{'group_by':'scrum_master_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Start Date" icon="terp_go_month" domain="[]" context="{'group_by':'date_start'}"/>
+                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" help="Sprint Month"/>
                     </group>
                 </search>
             </field>
@@ -335,6 +335,7 @@
                     <group colspan="4" col="6">
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
+                        <field name="responsible_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">

From a62779755da4fea5bae82548ee591d1617f9bd0e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 11:12:09 +0530
Subject: [PATCH 28/71] [IMP]: Improvement in configuration wizards

bzr revid: rpa@tinyerp.com-20100920054209-3hdi1n0bnjuyymim
---
 addons/account/account_installer.xml          |  2 +-
 addons/association/profile_association.py     | 15 ++++++++-----
 addons/crm/crm_installer.py                   |  6 +++---
 addons/crm/crm_installer_view.xml             |  2 +-
 addons/crm/wizard/crm_send_email_view.xml     |  2 +-
 addons/hr/hr_installer.xml                    |  2 +-
 addons/hr/installer.py                        |  2 +-
 addons/mrp/installer.py                       |  2 +-
 addons/project/installer.py                   |  9 +++-----
 addons/project/project_installer.xml          |  1 -
 addons/purchase/wizard/purchase_installer.xml |  2 +-
 addons/report_designer/installer.py           | 13 ++++--------
 addons/sale/sale.py                           |  2 +-
 addons/sale/sale_installer.py                 | 21 +++++++++----------
 addons/sale/sale_installer.xml                |  2 +-
 15 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index a9de51c3afb..a3570fae79a 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -73,7 +73,7 @@
 
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">Add extra Accounting Addons to the ones already installed. Remember you can always install them at a later stage.</attribute>
+                        <attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
                     </xpath>
                     <xpath expr="//button[@string='Install Modules']" position="attributes">
                         <attribute name="string">Configure</attribute>
diff --git a/addons/association/profile_association.py b/addons/association/profile_association.py
index f102d710fd8..eb9ac398500 100644
--- a/addons/association/profile_association.py
+++ b/addons/association/profile_association.py
@@ -27,13 +27,18 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'hr_expense':fields.boolean('Expenses Tracking', help="Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."),
-        'project':fields.boolean('Project Management'),
-        'event_project':fields.boolean('Organization and management of Events', help="This module allows you to create retro planning for managing your events."),
+        'hr_expense':fields.boolean('Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'project':fields.boolean('Project Management', 
+                              help="Helps you manage your projects and tasks by tracking them, "
+                 "generating plannings, etc..."),
+        'event_project':fields.boolean('Events', help="Helps you to manage and organize your events."),
         'project_gtd':fields.boolean('Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', 
-            help="An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc.")
+        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
     }
 profile_association_config_install_modules_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 6797afc62e0..3b1aae09bd0 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -33,15 +33,15 @@ class crm_installer(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
         'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."),
+        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP / IMAP server"),
         'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
         'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."),
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application"),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 5fad3f41a3d..ece3bae31ec 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Enhance your CRM basic Application with additional Addons.</attribute>
+            <attribute name="string">Enhance your core CRM Application with additional functionalities.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>13</attribute>
diff --git a/addons/crm/wizard/crm_send_email_view.xml b/addons/crm/wizard/crm_send_email_view.xml
index 77202a19f6c..91a934da0e0 100644
--- a/addons/crm/wizard/crm_send_email_view.xml
+++ b/addons/crm/wizard/crm_send_email_view.xml
@@ -81,7 +81,7 @@
                     <separator string=" " colspan="4"/>
                     <group colspan="4" col="3" >
                         <label string=" " />
-                        <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
                         <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
                     </group>
                 </form>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index ef7e3e4aad7..490523b4e12 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -19,7 +19,7 @@
                 <attribute name='string'></attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the base HR Application by installing few HR-related modules.</attribute>
+                <attribute name="string">You can enhance the base HR Application by installing few HR-related functionalities.</attribute>
             </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index f4ee1e99aba..8a4a6aeb58f 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -35,7 +35,7 @@ class hr_installer(osv.osv_memory):
             help="Helps you manage and streamline your recruitment process."),
         'hr_timesheet_sheet':fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
-                 "and attendance."),
+                 "and attendances."),
         'hr_contract': fields.boolean("Employee's Contracts",
             help="Extends employee profiles to help manage their contracts."),
         'hr_evaluation': fields.boolean('Periodic Evaluations',
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index eeb00ece494..b39ddb63eef 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -37,7 +37,7 @@ class mrp_installer(osv.osv_memory):
                  "procurement scheduler manually."),
         'mrp_operations': fields.boolean('Manufacturing Operations',
             help="Enhances production orders with readiness states as well "
-                 "as the date of start and end of execution of the order."),
+                 "as the start date and end date of execution of the order."),
         'mrp_subproduct': fields.boolean('MRP Subproducts',
             help="Enables multiple product output from a single production "
                  "order: without this, a production order can have only one "
diff --git a/addons/project/installer.py b/addons/project/installer.py
index ef2c2b5e8c8..95ab951949f 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -31,13 +31,11 @@ class project_installer(osv.osv_memory):
         'Long Term Planning',
             help="Enables long-term projects tracking, including "
                  "multiple-phase projects and resource allocation handling."),
-        'project_wiki': fields.boolean('Specifications in a Wiki',
-            help=""),
         'hr_timesheet_sheet': fields.boolean('Timesheets',
             help="Tracks and helps employees encode and validate timesheets "
-                 "and attendance."),
+                 "and attendances."),
         'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
-            help="Helps generate invoice based on human resources "
+            help="Helps generate invoices based on human resources "
                  "costs and general expenses."),
         'account_budget': fields.boolean('Budgets',
             help="Helps accountants manage analytic and crossover budgets."),
@@ -51,8 +49,7 @@ class project_installer(osv.osv_memory):
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
-            help="Embeds the 'Getting Things Done concepts' into OpenERP's "
-                 "project management."),
+            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         }
 
     _defaults={
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index e12fa4d3815..0093f6230be 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -26,7 +26,6 @@
           <group colspan="8">
             <field name="project_crm"/>
             <field name="project_long_term" groups="base.group_extended"/>
-            <field name="project_wiki" groups="base.group_extended"/>
             <field name="hr_timesheet_sheet"/>
             <field name="hr_timesheet_invoice"/>
             <field name="account_budget" groups="base.group_extended"/>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index 539edb3ec2f..93dadad007f 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -20,7 +20,7 @@
               </separator>
               <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">Extend your Purchases Management Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
+                <attribute name="string">Extend your Purchases Management Application with additional functionalities.</attribute>
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py
index 4dd35fd4560..1accab65c0b 100644
--- a/addons/report_designer/installer.py
+++ b/addons/report_designer/installer.py
@@ -26,17 +26,12 @@ class report_designer_installer(osv.osv_memory):
 
     _columns = {
         # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="This module adds wizards to import/export .SXW report that "
+        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
                                 "you can modify in OpenOffice.Once you have modified it you can "
                                 "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="Query Builder allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for and users. "
-                                "After installation, it adds a menu to define custom report in the Dashboard menu."),
-        'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online "
-                                "Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. "
-                                "After installation you will get Cube Browser and Cube Designer in Reporting Menu. "
-                                "Cube Browser is used to generate the reports with table view (mdx view) of mdx query "
-                                "and Cube Designer is used to make cubes in BI."),
+        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
+                                "reports  on several objects. It's a SQL query builder and browser for end users."),
+        'olap':fields.boolean('Business Intelligence Report',help="Helps you manage Online Analytical Process with the mdx query and provides Cube Designing and Cube Browsing"),
     }
 report_designer_installer()
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 47d5a635048..6fabd70c6f0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1154,7 +1154,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True),
+        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to synchronise invoice and delivery operations."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
diff --git a/addons/sale/sale_installer.py b/addons/sale/sale_installer.py
index 2bf00b80885..98cd63c6ecb 100644
--- a/addons/sale/sale_installer.py
+++ b/addons/sale/sale_installer.py
@@ -27,20 +27,19 @@ class sale_installer(osv.osv_memory):
 
     _columns = {
         'sale_analytic_plans': fields.boolean('Sales Analytic Distribution',
-            help="The base module to manage analytic distribution and sale orders."),
+            help="Helps you to manage analytic distribution and sales orders."),
         'sale_journal': fields.boolean('Sales and deliveries by journal',
-            help="The sale journal modules allows you to categorise your "
+            help="Allows you to categorise your "
                 "sales and deliveries (picking lists) between different journals. "
                 "This module is very helpful for bigger companies that "
-                "works by departments."),
-        'sale_layout': fields.boolean('Sale Order Layout Improvement',
-            help="This module provides some features to improve the layout of the Sale Order."),
-        'sale_margin': fields.boolean('Margins in Sale Orders',
-            help="This module adds the 'Margin' on sales order, "
-                "which gives the profitability by calculating "
-                "the difference between the Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Sale Order Dates',
-            help="Add commitment, requested and effective dates on the sale order."),
+                "work by departments."),
+        'sale_layout': fields.boolean('Sales Order Layout Improvement',
+            help="Provides some features to improve the layout of the Sales Order reports."),
+        'sale_margin': fields.boolean('Margins in Sales Orders',
+            help="Gives the margin of profitability by calculating "
+                 "the difference between Unit Price and Cost Price."),
+        'sale_order_dates': fields.boolean('Sales Order Dates',
+            help="Adds commitment, requested and effective dates on Sales Orders."),
         }
     
 sale_installer()
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index 9aab465573d..31da357f895 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -16,7 +16,7 @@
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">Add more functionalities to the core Sales Application with the following addons.</attribute>
+            <attribute name="string">Enhance your core Sales Application with additional functionalities.</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>

From 4def2f930b0bd5e96c5299afb95183a7d51185f7 Mon Sep 17 00:00:00 2001
From: "RHA(OpenERP)" <>
Date: Mon, 20 Sep 2010 11:41:01 +0530
Subject: [PATCH 29/71] [IMP]: Usability imporvements in project_* and 
 document_* modules

bzr revid: rvo@tinyerp.co.in-20100920061101-qizxmc2hyxcj2a9s
---
 addons/document/document_view.xml             |  8 ++--
 .../document_ftp/wizard/ftp_browse_view.xml   |  6 +--
 addons/project/project.py                     |  3 +-
 addons/project/project_view.xml               | 26 ++++++------
 .../project/wizard/project_task_delegate.py   |  4 +-
 .../wizard/project_task_delegate_view.xml     |  2 +-
 addons/project_issue/project_issue.py         |  6 +--
 addons/project_issue/project_issue_menu.xml   |  4 +-
 addons/project_issue/project_issue_view.xml   | 41 +++++++++++--------
 .../project_long_term_view.xml                | 29 +++++++------
 addons/project_scrum/project_scrum_view.xml   |  4 +-
 11 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f6e21f338e7..870330218c2 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -44,7 +44,7 @@
                     <field name="name" />
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                     </group>
                </search>
             </field>
@@ -80,7 +80,7 @@
                     <separator string="Directory Type" colspan="4"/>
                     <field name="type"/>
                     <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}">
-                        <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" 
+                        <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)"
                             attrs="{'required': [('type','=','ressource')] }"/>
                         <field name="resource_find_all" groups="base.group_extended" />
                         <newline/>
@@ -93,7 +93,7 @@
                         <field name="ressource_parent_type_id"/>
                         <field name="ressource_id" select="2" readonly="1"/>
                     </group>
-                    
+
                 </page>
                 <page string="Generated Files" groups="base.group_extended">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
@@ -168,7 +168,7 @@
                     <field name="storage_id" />
                     <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
-                        <filter string="Type"  domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
                         <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Storage" domain="[]" context="{'group_by':'storage_id'}"/>
                     </group>
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 44cedccfc3e..7a52c1fd291 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -4,7 +4,7 @@
     <record id="ftp_browse_form" model="ir.ui.view">
             <field name="name">Document FTP Browse</field>
             <field name="model">document.ftp.browse</field>
-            <field name="type">form</field>           
+            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Browse Document">
                     <separator string="Browse Document" colspan="4"/>
@@ -12,7 +12,7 @@
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
-                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
                         <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok"/>
                     </group>
                 </form>
@@ -32,7 +32,7 @@
         <menuitem
         name="Shared Repository (FTP)"
         action="action_ftp_browse"
-        id="menu_document_browse"        
+        id="menu_document_browse"
         icon="STOCK_EXECUTE"
         parent="document.menu_document_doc" sequence="1"/>
 
diff --git a/addons/project/project.py b/addons/project/project.py
index a746f88cfb8..ca56fa3ba77 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -423,8 +423,7 @@ class task(osv.osv):
         'date_start': fields.datetime('Starting Date'),
         'date_end': fields.datetime('Ending Date'),
         'date_deadline': fields.date('Deadline'),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade',
-            help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 421729ccda5..bf801adca1d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,8 +21,8 @@
                         <field name="name" string="Project Name" select="1"/>
                         <field name="parent_id" string="Parent Project"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date_start" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="date" 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>
                     <notebook colspan="4">
@@ -44,11 +44,13 @@
                             </group>
                             <newline/>
                             <group col="9" colspan="8">
+                            	<separator colspan="8"/>
+                            	<newline/>
                                 <field name="state" select="1" readonly="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                                <button name="set_done" string="Done" type="object" states="open,pending" icon="gtk-jump-to"/>
+                                <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
                                 <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
                                 <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
                                 <button
@@ -110,7 +112,7 @@
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <filter string="Manager" name="Manager"  icon="terp-personal" domain = "[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Partner" name="Partner"  icon="terp-personal" domain = "[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}" help="Parent Project"/>
                          <separator orientation="vertical"/>
                         <filter string="Parent" name="Parent"  icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
@@ -239,7 +241,7 @@
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="%(action_project_task_close)d" states="pending,open" string="Done" type="action" icon="gtk-apply"/>
+                                <button name="%(action_project_task_close)d" states="pending,open" string="Done" type="action" icon="terp-dialog-close"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -276,7 +278,7 @@
                             <field name="partner_id"/>
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
-                                <field name="type_id" widget="selection" readonly="1"/>
+                                <field name="type_id" widget="selection"/>
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
                                 <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
                             </group>
@@ -302,6 +304,7 @@
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
+                    <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
                         states="draft,open,pending"
                         string="Change Stage"
@@ -309,7 +312,6 @@
                         icon="gtk-go-forward"
                         groups="base.group_extended"
                         help="Change Type"/>
-                    <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -369,7 +371,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, Open and Pending Tasks" icon="terp-check" default="1"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check" default="1"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="Open 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"/>
@@ -397,9 +399,10 @@
                         <filter string="Stages" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="State" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
+                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
+                        <separator orientation="vertical"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}"/>
-                        <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                     </group>
                 </search>
             </field>
@@ -414,10 +417,7 @@
             <field name="view_id" ref="view_task_tree2"/>
             <field name="context">{"search_default_project_id":project_id, "search_default_user_id":uid, "search_default_current": 1}</field>
             <field name="search_view_id" ref="view_task_search_form"/>
-            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion.A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.
-
-Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.
-</field>
+            <field name="help">In OpenERP, a project is made of a set of activities (or tasks) for completion. A list view allows the manager to quickly check for task status and make it evolve, delegate task, etc. A search tool allows a multi-criteria sort of activities.</field>
         </record>
         <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="2"/>
 
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 2ce74ceefc8..2430b8a0896 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -30,7 +30,7 @@ class project_task_delegate(osv.osv_memory):
 
     _columns = {
         'name': fields.char('Delegated Title', size=64, required=True, help="New title of the task delegated to the user"),
-        'prefix': fields.char('Your Task Title', size=64, required=True, help="New title of your own task to validate the work done"),
+        'prefix': fields.char('Your Task Title', size=64, required=True, help="Title for your validation task"),
         'user_id': fields.many2one('res.users', 'Assign To', required=True, help="User you want to delegate this task to"),
         'new_task_description': fields.text('New Task Description', help="Reinclude the description of the task in the task of the user"),
         'planned_hours': fields.float('Planned Hours',  help="Estimated time to close this task by the delegated user"),
@@ -51,7 +51,7 @@ class project_task_delegate(osv.osv_memory):
         project = task.project_id
         manager = project.user_id or False
         partner = task.partner_id or task.project_id.partner_id
-        
+
         if 'name' in fields:
             if task.name.startswith(_('CHECK: ')):
                 newname = str(task.name).replace(_('CHECK: '), '')
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index a9e4e97b93a..dc299826419 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" colspan="4"/>
+           	                <field name="prefix" string="Validatation Task Title" colspan="4"/>
                             <field name="state" colspan="4"/>
 		              </group>
                       <separator string="" colspan="4"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5c5a8907dc9..05e047914b7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -70,7 +70,7 @@ class project_issue(crm.crm_case, osv.osv):
             message = _('Issue ') + " '" + name + "' "+ _("is Closed.")
             self.log(cr, uid, id, message)
         return res
-    
+
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         if context is None:
             context = {}
@@ -152,7 +152,7 @@ class project_issue(crm.crm_case, osv.osv):
                                  domain="[('partner_id','=',partner_id)]"),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'Todo'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
+        'state': fields.selection([('draft', 'Draft'), ('open', 'To Do'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
                                   \nWhen the case is over, the state is set to \'Done\'.\
@@ -409,7 +409,7 @@ class project(osv.osv):
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'reply_to' : fields.char('Reply-To Email Address', size=256)
     }
-    
+
     def _check_escalation(self, cr, uid, ids):
          project_obj = self.browse(cr, uid, ids[0])
          if project_obj.project_escalation_id:
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 9c074ed2fd3..514fd59c8d6 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -12,10 +12,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="project_issue_tree_view"/>
-        <field name="domain" eval="[('categ_id','=',ref('bug_categ'))]"/>
+        <field name="domain" eval=""/>
         <field name="context">{"search_default_user_id": uid, "search_default_current":1, "search_default_project_id":project_id}</field>
         <field name="search_view_id" ref="view_project_issue_filter"/>
-        <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here.A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
+        <field name="help">Issues like bugs in a system, client complain, materials breakdown are collected here. A list view allows the manager to quickly check for them, assign them, make their status evolved.</field>
     </record>
 
     <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view0">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ac8ffc5b721..7fc2db7c775 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -66,7 +66,7 @@
                             <group col="8" colspan="4">
                             <field name="state" />
                             <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                            <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
                             <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                             <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                             <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
@@ -75,7 +75,7 @@
                         </page>
                         <page string="Emails" groups="base.group_extended">
                             <group colspan="4">
-                            <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
+                            <field colspan="4" name="email_cc" string="Global CC" widget="url"/>
                             </group>
                             <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
                                 <tree string="History">
@@ -157,7 +157,7 @@
             <field name="model">project.issue</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree"  colors="red:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="id"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -174,11 +174,12 @@
                     <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
                     <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -190,8 +191,8 @@
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
                     <group>
-                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and Open Issues" icon="terp-check" default="1"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
+                        <filter string="Current" name="current" domain="[('state','in',('open','draft'))]" help="Draft and To Do" icon="terp-check" default="1"/>
+                        <filter string="To Do" domain="[('state','=','open')]" help="Open Issues" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]"  help="Pending Issues" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-go-today" string="   Today   " separator="1" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]" help="Today's bugs" />
@@ -204,25 +205,31 @@
                         <field name="user_id"/>
                         <field name="project_id" string="Project"/>
                         <field name="state"/>
+                        <field name="categ_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..."  groups="base.group_extended">
+                    	<filter string="Responsible" icon="terp-personal"
+                            domain="[]" context="{'group_by':'user_id'}" />
+                    	<filter string="Partner" icon="terp-partner" domain="[]"
+                            context="{'group_by':'partner_id'}" />
+						<separator orientation="vertical"/>
                         <filter string="Project"  icon="terp-folder-blue" domain="[]"
                             context="{'group_by':'project_id'}" />
-                        <filter string="Stage" icon="terp-stage" domain="[]"
-                            context="{'group_by':'stage_id'}" />
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                            context="{'group_by':'priority'}" />
                         <filter string="Version" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-personal" domain="[]"
-                            context="{'group_by':'partner_id'}" />
-                        <filter string="Salesman" icon="terp-personal"
-                            domain="[]" context="{'group_by':'user_id'}" />
+						<separator orientation="vertical"/>
+						<filter string="Category" icon="terp-stock_symbol-selection" domain="[]"
+                            context="{'group_by':'categ_id'}" />
+						<filter string="Priority" icon="terp-rating-rated" domain="[]"
+                            context="{'group_by':'priority'}" />
+                        <filter string="Stage" icon="terp-stage" domain="[]"
+                            context="{'group_by':'stage_id'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            context="{'group_by':'state'}" />
                         <separator orientation="vertical" />
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'create_date'}" />
+                            domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
             </field>
@@ -316,6 +323,6 @@
                 </field>
             </field>
        </record>
-       
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ae5b2600092..132dc24ce4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -30,7 +30,7 @@
                 <form string="Project Resource Allocation">
                     <field name="resource_id" select="1"/>
                     <field name="phase_id"/>
-                    <field name="useability"/>
+                    <field name="useability" string="Availability"/>
                 </form>
             </field>
         </record>
@@ -90,16 +90,21 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" on_change="onchange_project(project_id)"/>
-                        <field name="responsible_id"/>
-                    </group>
-                    <group colspan="6" col="6">
-                        <field name="duration" />
-                        <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-                        <field name="date_start"/>
-                        <field name="date_end"/>
+	                    <group colspan="2" col="2">
+	                        <field name="name" select="1"/>
+	                        <field name="date_start"/>
+	                        <field name="date_end"/>
+	                    </group>
+	                    <group colspan="2" col="2">
+	                       <field name="project_id" on_change="onchange_project(project_id)" />
+	                       <field name="duration" />
+	                    </group>
+	                    <group colspan="2" col="2">
+	                       <field name="responsible_id"/>
+	                       <newline/>
+	                       <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]" colspan="2"/>
                     </group>
+					</group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -116,9 +121,9 @@
                             <group col="12" colspan="4">
                                 <field name="state" select="1"/>
                                 <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                                <button string="Done" name="set_done" states="pending,open" icon="gtk-apply"/>
                                 <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
+                                <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
+                                <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                                 <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
                             </group>
                         </page>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 4d88aae05c0..f857c31d756 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -527,10 +527,10 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/search/group[@string='Group By...']/filter[@string='End Date']" position="after">
+                <xpath expr="/search/group[@string='Group By...']/filter[@string='Project']" position="after">
+                	<separator orientation="vertical"/>
                     <filter string="Sprint" icon="terp-gtk-jump-to-ltr" domain="[]" context="{'group_by':'sprint_id'}"/>
                     <filter string="Backlog" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'product_backlog_id'}"/>
-                    <separator orientation="vertical"/>
                 </xpath>
             </field>
         </record>

From 74418f42ea397031757e087958bcaedf01b7bdd5 Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Mon, 20 Sep 2010 12:20:00 +0530
Subject: [PATCH 30/71] [FIX]

bzr revid: rvo@tinyerp.co.in-20100920065000-n85k52o4kp7q1ecr
---
 addons/project_scrum/__openerp__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 3350419af30..3e18db77f68 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -53,10 +53,10 @@
         'security/ir.model.access.csv',
         'project_scrum_report.xml',
         'wizard/project_scrum_backlog_create_task_view.xml',
-        'project_scrum_view.xml',
-        'process/project_scrum_process.xml',
-        'wizard/project_scrum_backlog_sprint_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
+        'project_scrum_view.xml',
+        'wizard/project_scrum_backlog_sprint_view.xml',
+        'process/project_scrum_process.xml',
         "board_project_scrum_view.xml",
     ],
     'demo_xml': ['project_scrum_demo.xml'],

From ff4535b42c79ce5b328aeda543c8c93ca415c884 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 12:37:07 +0530
Subject: [PATCH 31/71] [IMP]: crm: Improvement for contact name, Convert to
 Partner and Create partner

bzr revid: rpa@tinyerp.com-20100920070707-esfbui7owilrwwfe
---
 addons/crm/crm_lead.py                       |  1 +
 addons/crm/crm_lead_view.xml                 | 13 ++++++++-----
 addons/crm/wizard/crm_lead_to_opportunity.py |  2 +-
 addons/crm/wizard/crm_lead_to_partner.py     |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index d4b08ad2b44..9b8e9edb93b 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -125,6 +125,7 @@ class crm_lead(crm_case, osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Lead Type', \
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
+        'contact_name': fields.char('Contact Name', size=64),
         'partner_name': fields.char("Partner Name", size=64),
         'optin': fields.boolean('Opt-In'),
         'optout': fields.boolean('Opt-Out'),
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7783c7be1b5..35ea1c335c9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -55,7 +55,7 @@
         <field name="arch" type="xml">
             <form string="Leads Form">
                 <group colspan="4" col="7">
-                    <field name="name" required="1" string="Contact Name"/>
+                    <field name="name" required="1" string="Subject"/>
                     <field name="priority"/>
                     <field name="categ_id"
                         widget="selection"
@@ -83,9 +83,12 @@
                 </group>
                 <notebook colspan="4">
                 <page string="Lead">
+                    <group colspan="4" col="2">
+                        <field name="partner_name" string="Partner Name" />
+                    </group>
                     <group colspan="2" col="4">
                         <separator string="Contact" colspan="4" col="4"/>
-                        <field name="partner_name" string="Partner Name" colspan="4"/>
+                        <field name="contact_name" colspan="4"/>
                         <newline/>
                         <field domain="[('domain', '=', 'contact')]" name="title"/>
                         <field name="function" />
@@ -232,8 +235,8 @@
             <tree string="Leads"  colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                 <field name="date_deadline" invisible="1"/>
                 <field name="create_date"/>
-                <field name="name" string="Contact Name"/>
-                <field name="partner_name"/>
+                <field name="name" string="Subject"/>
+                <field name="contact_name"/>
                 <field name="country_id" invisible="context.get('invisible_country', True)" />
                 <field name="email_from"/>
                 <field name="phone"/>
@@ -313,7 +316,7 @@
                     domain="[('create_date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]"
                 />
                 <separator orientation="vertical"/>
-                <field name="name"/>
+                <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
                 <field name="user_id">
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index b02cc1f5197..de93e1259f3 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -149,7 +149,7 @@ Leads Could not convert into Opportunity"))
         res = super(crm_lead2opportunity, self).default_get(cr, uid, fields, context=context)
         for lead in lead_obj.browse(cr, uid, data, context=context):
             if 'name' in fields:
-                res.update({'name': lead.partner_name})
+                res.update({'name': lead.name})
             if 'partner_id' in fields:
                 res.update({'partner_id': lead.partner_id.id or False})
         return res
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 8592a934647..aeb5b2db673 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -143,13 +143,13 @@ class crm_lead2partner(osv.osv_memory):
             for lead in lead_obj.browse(cr, uid, rec_ids):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
-                        'name': lead.partner_name or lead.name,
+                        'name': lead.partner_name or lead.contact_name or lead.name,
                         'user_id': lead.user_id.id,
                         'comment': lead.description,
                     })
                     contact_id = contact_obj.create(cr, uid, {
                         'partner_id': partner_id,
-                        'name': lead.name,
+                        'name': lead.contact_name,
                         'phone': lead.phone,
                         'mobile': lead.mobile,
                         'email': lead.email_from,

From e54ad089c557247784e3c148e6fda9f10e31b91b Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 12:54:54 +0530
Subject: [PATCH 32/71] [IMP]: crm: Improvement in Lead's search view

bzr revid: rpa@tinyerp.com-20100920072454-n1diwqftua8xa3z7
---
 addons/crm/crm_lead_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 35ea1c335c9..b6a7df87900 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -298,7 +298,7 @@
             <search string="Search Leads">
                 <filter icon="terp-check"
                     string="Current"
-                    default="1" name="current"
+                    default="1" name="current" help="Draft and Open Leads"
                     domain="[('state','in',('draft','open'))]"/>
                 <filter icon="terp-camera_test"
                     string="Open"
@@ -351,16 +351,16 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                     <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
+                    <filter string="Source" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Creation" icon="terp-go-month"
-                        domain="[]" context="{'group_by':'create_date'}" />
+                        domain="[]" context="{'group_by':'create_date'}" help="Create Date"/>
                 </group>
            </search>
         </field>

From 636ecd5158c1f546fb26f75ce3219eff76b7f81e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 16:10:59 +0530
Subject: [PATCH 33/71] [IMP]: crm*: Organized search views properly

bzr revid: rpa@tinyerp.com-20100920104059-j9xrvz5qbxd39umx
---
 addons/base_calendar/base_calendar_view.xml   |  9 ++--
 addons/crm/crm_meeting_view.xml               | 41 +++++++++----------
 addons/crm/crm_opportunity_view.xml           | 16 ++++----
 addons/crm/crm_phonecall_view.xml             |  9 ++--
 addons/crm_claim/crm_claim_view.xml           |  2 +-
 .../crm_fundraising/crm_fundraising_view.xml  |  2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml     |  4 +-
 7 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 35e3f794571..5ccdb90ed71 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -128,6 +128,11 @@
                    <field name="event_date" select="1"/>
                    <newline/>
                     <group expand="0" string="Group By...">
+                        <filter string="Responsible" icon="terp-personal" domain="[]"
+                            context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-partner" domain="[]"
+                            context="{'group_by':'partner_address_id'}" />
+                        <separator orientation="vertical" />
                         <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
                             domain="[]" context="{'group_by':'cutype'}" />
                         <filter string="Role" icon="terp-gtk-select-all"
@@ -135,10 +140,6 @@
                         <filter string="Required Reply" icon="terp-mail-replied"
                             domain="[]" context="{'group_by':'rsvp'}" />
                         <separator orientation="vertical" />
-                        <filter string="User" icon="terp-personal" domain="[]"
-                            context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
-                            context="{'group_by':'partner_address_id'}" />
                         <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':'state'}" />
                     </group>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 5dbadcd26e1..3f36ad6ce2a 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -319,32 +319,31 @@
                            </field>
                            <field name="user_id" select="1"/>
                        </group>
-                       <newline/>
-                           <group expand="0" string="Group By...">
-                            <filter string="Date" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date'}" />
-                            <filter string="Privacy" icon="terp-locked"
-                                domain="[]" context="{'group_by':'class'}" />
-                            <filter string="Show time as" icon="terp-project"
-                                domain="[]" context="{'group_by':'show_as'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Responsible" icon="terp-personal" domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <filter string="Partner" icon="terp-personal" domain="[]"
-                                context="{'group_by':'partner_id'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Meeting Type" help="Meeting Type"
-                            	icon="terp-stock_symbol-selection" domain="[]"
-                            	context="{'group_by':'categ_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <separator orientation="vertical" />
-                        </group>
                         <newline/>
                         <group expand="0" string="Extended Options...">
                            <field name="class" select="1" string="Privacy"/>
                            <field name="show_as" string="Show time as" select="1"/>
                         </group>
+                       <newline/>
+                       <group expand="0" string="Group By...">
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <filter string="Partner" icon="terp-partner" domain="[]"
+                                context="{'group_by':'partner_id'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Type" help="Meeting Type"
+                            	icon="terp-stock_symbol-selection" domain="[]"
+                            	context="{'group_by':'categ_id'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <filter string="Show time as" icon="terp-project"
+                                domain="[]" context="{'group_by':'show_as'}" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Date" icon="terp-go-month" help="Meeting date"
+                                domain="[]" context="{'group_by':'date'}" />
+                        </group>
                 </search>
             </field>
         </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 632cb2510c8..740b113d0ed 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -284,7 +284,7 @@
                 <field name="arch" type="xml">
                     <search string="Search Opportunities">
                         <filter icon="terp-check"
-                            string="Current"  help="Current Opportunities"
+                            string="Current"  help="Draft and Open Opportunities"
                             name="current"
                             domain="[('state','in',('draft','open'))]"/>
                         <filter icon="terp-camera_test"
@@ -338,19 +338,19 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By..." colspan="16">
+                            <filter string="Salesman" icon="terp-personal"
+                                domain="[]" context="{'group_by':'user_id'}" />
+                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                            <filter string="Assigned Partner" icon="terp-partner"
+                                domain="[]" context="{'group_by':'partner_assigned_id'}" />
+                            <separator orientation="vertical" />
                             <filter string="Stage" icon="terp-stage" domain="[]"
                                 context="{'group_by':'stage_id'}" />
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <filter string="Priority" icon="terp-rating-rated" domain="[]"
                                 context="{'group_by':'priority'}" />
                             <filter string="Category" icon="terp-stock_symbol-selection"
                                 domain="[]" context="{'group_by':'categ_id'}" />
-                            <separator orientation="vertical" />
-                            <filter string="Salesman" icon="terp-personal"
-                                domain="[]" context="{'group_by':'user_id'}" />
-                            <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                            <filter string="Assigned Partner" icon="terp-personal"
-                                domain="[]" context="{'group_by':'partner_assigned_id'}" />
+                             <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                             <separator orientation="vertical" />
                             <filter string="Creation" icon="terp-go-month"
                                 domain="[]" context="{'group_by':'create_date'}" />
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index ae243b8cfb0..be1f62a46db 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -260,10 +260,9 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Phonecalls">
-               <filter icon="terp-go-today" string="Current"
+               <filter icon="terp-check" string="Current"
                    name="current"
                    domain="[('state','in', ('draft','open','pending'))]"/>
-               <separator orientation="vertical"/>
                <filter icon="terp-go-today" string="Today"
                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d 23:59:59')),\
                     ('date','&gt;=',datetime.strftime('%%Y-%%m-%%d 00:00:00'))]"
@@ -292,15 +291,15 @@
                </field>
                <newline/>
                <group expand="0" string="Group By..." colspan="4">
-                   <filter string="Partner" icon="terp-personal" domain="[]"
+                   <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}" />
                    <filter string="Responsible" icon="terp-personal"
                        domain="[]" context="{'group_by':'user_id'}" />
                    <separator orientation="vertical" />
-                   <filter string="Creation" icon="terp-go-month"
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date"
                        domain="[]" context="{'group_by':'create_date'}" />
                    <filter string="Date" icon="terp-go-month" domain="[]"
-                       context="{'group_by':'date'}" />
+                       context="{'group_by':'date'}" help="Date of Call" />
                </group>
            </search>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 9d08b231eeb..7aa7f8bc0ca 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -269,7 +269,7 @@
                 <search string="Search Claims">
                    <filter icon="terp-check" string="Current" name="current"
                        domain="[('state','in',('draft', 'open'))]"
-                       separator="1" help="Current Claims" default="1"
+                       separator="1" help="Draft and Open Claims" default="1"
                    />
                    <filter icon="terp-camera_test"
                        string="In Progress"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index dd7c2094f74..8cb6b5ba6a1 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -298,7 +298,7 @@
                         </group>
                         <newline/>
                         <group expand="0" string="Group By...">
-                            <filter string="Partner" icon="terp-personal"
+                            <filter string="Partner" icon="terp-partner"
                                 domain="[]"
                                 context="{'group_by':'partner_id'}" />
                             <filter string="Responsible" icon="terp-personal"
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 0f657afb895..f7c89620f29 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -264,10 +264,10 @@
                            domain="[]" help="Sales Team"
                            context="{'group_by':'section_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                            context="{'group_by':'state'}" />
                         <filter string="Priority" icon="terp-rating-rated"
                             domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                            context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Date" icon="terp-go-month"
                            domain="[]" help="Request Date"

From e387dbf8e9476863ec292600aa88fd50b83155af Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:03:27 +0530
Subject: [PATCH 34/71] [IMP]: crm*: Improvements

bzr revid: rpa@tinyerp.com-20100920113327-unij93lplhbx99ns
---
 addons/crm/crm_phonecall_view.xml               | 11 ++++++-----
 addons/crm/wizard/crm_lead_to_opportunity.py    |  2 +-
 addons/crm_claim/crm_claim.py                   |  6 ++----
 addons/crm_claim/crm_claim_view.xml             |  4 +++-
 addons/crm_claim/i18n/en_US.po                  |  4 ++--
 addons/crm_fundraising/crm_fundraising.py       |  6 ++----
 addons/crm_fundraising/crm_fundraising_view.xml |  2 +-
 addons/crm_fundraising/i18n/en_US.po            |  4 ++--
 addons/crm_helpdesk/i18n/en_US.po               |  4 ++--
 9 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index be1f62a46db..688a6bedf06 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -49,9 +49,10 @@
                 <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
+                    icon="gtk-index"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
-                    states="draft,open,pending"
+                    states="draft,open,pending" icon="gtk-redo"
                      name="action_make_meeting" type="object" />
                 <field name="state"/>
                 <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
@@ -96,7 +97,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="terp-crm"
+                        icon="gtk-index"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
@@ -123,7 +124,7 @@
                         states="draft,pending" type="object"
                         icon="gtk-go-forward" />
                     <button name="case_pending" string="Not Held"
-                        states="open" type="object" icon="gtk-undo" />
+                        states="open" type="object" icon="gtk-media-pause" />
                     <button name="case_close" string="Held"
                         states="open,draft,pending" type="object"
                         icon="gtk-jump-to" />
@@ -174,7 +175,7 @@
                     <field name="partner_id"
                         on_change="onchange_partner_id(partner_id, email_from)" />
                     <button string="Create a Partner"
-                        icon="terp-crm"
+                        icon="gtk-index"
                         name="%(action_crm_phonecall2partner)d"
                         type="action"
                         attrs="{'invisible':[('partner_id','!=',False)]}" />
@@ -228,7 +229,7 @@
                 <button string="Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="draft,open,pending"
-                    icon="gtk-convert"
+                    icon="gtk-index"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                 <button string="Meeting"
                     states="draft,open,pending" icon="gtk-redo"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index de93e1259f3..2452132b64a 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -105,7 +105,7 @@ class crm_lead2opportunity(osv.osv_memory):
         return value
 
     _columns = {
-        'name' : fields.char('Opportunity Summary', size=64, required=True, select=1), 
+        'name' : fields.char('Opportunity', size=64, required=True, select=1), 
         'probability': fields.float('Success Rate (%)'), 
         'planned_revenue': fields.float('Expected Revenue'), 
         'partner_id': fields.many2one('res.partner', 'Partner'), 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 81a98a7e326..de77c842aa6 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -46,10 +46,8 @@ class crm_claim(crm.crm_case, osv.osv):
         'ref' : fields.reference('Reference', selection=crm._links_get, size=128), 
         'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128), 
         '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."), 
+                     help="The channels represent the different communication \
+ modes available with the customer."), 
         'planned_revenue': fields.float('Planned Revenue'), 
         'planned_cost': fields.float('Planned Costs'), 
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7aa7f8bc0ca..adc3045893c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -57,7 +57,7 @@
             <field name="model">crm.claim</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Claims" colors="blue:state=='pending';black:state=='open';gray:state in ('close', 'cancel')">
+                <tree string="Claims" colors="blue:state=='pending';black:state=='open';gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" />
@@ -330,6 +330,7 @@
             context="{'default_partner_id': active_id}"
             id="act_claim_partner"
             name="Report a Claim"
+            view_mode="form,tree"
             res_model="crm.claim"
             src_model="res.partner"/>
 
@@ -339,6 +340,7 @@
             context="{'default_partner_address_id': active_id}"
             id="act_claim_partner_address"
             name="Report a Claim"
+            view_mode="form,tree"
             res_model="crm.claim"
             src_model="res.partner.address"/>
 
diff --git a/addons/crm_claim/i18n/en_US.po b/addons/crm_claim/i18n/en_US.po
index 27818261434..b67bd61d7f9 100644
--- a/addons/crm_claim/i18n/en_US.po
+++ b/addons/crm_claim/i18n/en_US.po
@@ -87,8 +87,8 @@ msgstr "Day"
 
 #. module: crm_claim
 #: help:crm.claim,canal_id:0
-msgid "The channels represent the different communicationmodes available with the customer. With each commercial opportunity, you can indicate thecanall which is this opportunity source."
-msgstr "The channels represent the different communicationmodes available with the customer. With each commercial opportunity, you can indicate thecanall which is this opportunity source."
+msgid "The channels represent the different communication modes available with the customer."
+msgstr "The channels represent the different communication modes available with the customer."
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
diff --git a/addons/crm_fundraising/crm_fundraising.py b/addons/crm_fundraising/crm_fundraising.py
index df7bc4a0789..0050642a5db 100644
--- a/addons/crm_fundraising/crm_fundraising.py
+++ b/addons/crm_fundraising/crm_fundraising.py
@@ -71,10 +71,8 @@ class crm_fundraising(crm.crm_case, osv.osv):
             'ref': fields.reference('Reference', selection=crm._links_get, size=128), 
             'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128), 
             '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."), 
+                        help="The channels represent the different communication \
+ modes available with the customer."), 
             'state': fields.selection(crm.AVAILABLE_STATES, 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8cb6b5ba6a1..38c53fa89b7 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -63,7 +63,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Funds Tree"
-                    colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                    colors="blue:state=='pending';grey:state in ('cancel', 'done')">
                     <field name="name" string="Fund Description" />
                     <field name="categ_id" />
                     <field name="type_id" string="Payment Mode" />
diff --git a/addons/crm_fundraising/i18n/en_US.po b/addons/crm_fundraising/i18n/en_US.po
index 95596bc11d8..2ea24862e69 100644
--- a/addons/crm_fundraising/i18n/en_US.po
+++ b/addons/crm_fundraising/i18n/en_US.po
@@ -38,8 +38,8 @@ msgstr "Avg. Probability"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,canal_id:0
-msgid "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."
-msgstr "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."
+msgid "The channels represent the different communication modes available with the customer."
+msgstr "The channels represent the different communication modes available with the customer."
 
 #. module: crm_fundraising
 #: constraint:ir.actions.act_window:0
diff --git a/addons/crm_helpdesk/i18n/en_US.po b/addons/crm_helpdesk/i18n/en_US.po
index aa9bfddea3f..f5a52dd2a48 100644
--- a/addons/crm_helpdesk/i18n/en_US.po
+++ b/addons/crm_helpdesk/i18n/en_US.po
@@ -547,8 +547,8 @@ msgstr "Probability (%)"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,canal_id:0
-msgid "The channels represent the different communication  modes available with the customer."
-msgstr "The channels represent the different communication  modes available with the customer."
+msgid "The channels represent the different communication modes available with the customer."
+msgstr "The channels represent the different communication modes available with the customer."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0

From 82241c40efb5ba8673026d72078673e0f4f60dc2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:36:00 +0530
Subject: [PATCH 35/71] [IMP]: crm: Minor improvements for stage and categories

bzr revid: rpa@tinyerp.com-20100920120600-1vly7d3sq2zisne9
---
 addons/crm/crm.py       | 2 +-
 addons/crm/crm_view.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a16f749323d..e421c990b21 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -587,7 +587,7 @@ class crm_case_categ(osv.osv):
     _description = "Category of case"
 
     _columns = {
-        'name': fields.char('Case Category Name', size=64, required=True, translate=True),
+        'name': fields.char('Name', size=64, required=True, translate=True),
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'object_id': fields.many2one('ir.model', 'Object Name'),
     }
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 133e8d13eeb..a360878d6d2 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -113,7 +113,7 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="section_id" select="1"/>
                     <field name="object_id" invisible="1" />
                     <field name="sequence"/>
                     <field name="probability"/>
@@ -142,7 +142,7 @@
             <field name="arch" type="xml">
                 <form string="Case Category">
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="section_id" select="1"/>
                     <field name="object_id"  invisible="1" />
                 </form>
             </field>
@@ -186,7 +186,7 @@
             <field name="arch" type="xml">
                 <form string="Resource Type">
                     <field name="name" select="1"/>
-                    <field name="section_id" select="1" widget="selection"/>
+                    <field name="section_id" select="1"/>
                     <field name="object_id"  />
                 </form>
             </field>

From 37330b18b1303e9f2ff960deb9d1a6788cf196d5 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:42:05 +0530
Subject: [PATCH 36/71] [IMP]: base_action_rule: Minor improvement in view

bzr revid: rpa@tinyerp.com-20100920121205-ix21oaflbc3uhmp4
---
 addons/base_action_rule/base_action_rule_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 526fe55f4a3..755f6680d34 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -14,11 +14,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Action Rule">
-                    <field name="name"/>
-                    <field name="model_id" select="1" on_change="onchange_model_id(model_id)"/>
-                    <field name="filter_id" />
-                    <field name="sequence"/>
-                    <field name="active"/>
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="model_id" select="1" on_change="onchange_model_id(model_id)"/>
+                        <field name="filter_id" />
+                        <field name="sequence"/>
+                        <field name="active"/>
+                    </group>
                     <notebook colspan="4">
                         <page string="Conditions">
                             <group col="2" colspan="2" name="model">

From b6190052b9839031b1af31494871ea3a55e3c38f Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:49:27 +0530
Subject: [PATCH 37/71] [IMP]: base_calendar: Minor improvement in search view

bzr revid: rpa@tinyerp.com-20100920121927-dwd0o0bac6vca67j
---
 addons/base_calendar/base_calendar_view.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 5ccdb90ed71..c3292452298 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -458,21 +458,23 @@
                            <field name="user_id" select="1"/>
                            <separator orientation="vertical"/>
                            <field name="show_as" select="1"/>
-                           <field name="class" select="1"/>
+                           <field name="class" select="1" string="Privacy"/>
                        </group>
                        <newline/>
                         <group expand="0" string="Group By...">
-                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                            <filter string="Date" icon="terp-go-month"
-                                domain="[]" context="{'group_by':'date'}" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                            <separator orientation="vertical" />
                             <filter string="Availability" icon="terp-camera_test"
                                 domain="[]" context="{'group_by':'show_as'}" />
                             <filter string="Privacy" icon="terp-locked"
                                 domain="[]" context="{'group_by':'class'}" />
+                            <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}" />
                             <separator orientation="vertical" />
-                            <filter string="Responsible" icon="terp-personal" domain="[]"
-                                context="{'group_by':'user_id'}" />
+                            <filter string="Date" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date'}" />
+                            
                         </group>
                 </search>
             </field>

From 38c20870568101a66bda184937a277b3f068a4e2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:52:58 +0530
Subject: [PATCH 38/71] [IMP]: crm: Added help text for probability

bzr revid: rpa@tinyerp.com-20100920122258-s3btrq93v4qa1wjw
---
 addons/crm/crm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index e421c990b21..ad108531daf 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -654,7 +654,7 @@ class crm_case_stage(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
         'object_id': fields.many2one('ir.model', 'Object Name'),
-        'probability': fields.float('Probability (%)', required=True),
+        'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
         'on_change': fields.boolean('Change Probability Automatically', \
                          help="Change Probability on next and previous stages."),
         'requirements': fields.text('Requirements')

From c47de2654d97ad3d3d6fbfdebf498ff149b9c2f8 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 17:56:34 +0530
Subject: [PATCH 39/71] [IMP]: crm*: "Add new note" ==> "Add Internal Note"

bzr revid: rpa@tinyerp.com-20100920122634-y18p4vvdqlbnc02q
---
 addons/crm/crm_lead_view.xml                    | 2 +-
 addons/crm/crm_opportunity_view.xml             | 2 +-
 addons/crm/crm_view.xml                         | 2 +-
 addons/crm/wizard/crm_add_note.py               | 2 +-
 addons/crm_claim/crm_claim_view.xml             | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/crm_helpdesk/crm_helpdesk_view.xml       | 2 +-
 addons/event/event_view.xml                     | 2 +-
 addons/hr_recruitment/hr_recruitment_view.xml   | 2 +-
 addons/project_issue/project_issue_view.xml     | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b6a7df87900..2206e536d0e 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -208,7 +208,7 @@
                             </notebook>
                         </form>
                     </field>
-                    <button string="Add New Note"
+                    <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
                         context="{'model': 'crm.lead' }"
                         icon="terp-document-new" type="action" />
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 740b113d0ed..18063b850e4 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -166,7 +166,7 @@
                                     </notebook>
                                 </form>
                             </field>
-                            <button string="Add New Note"
+                            <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a360878d6d2..eb05c5c9f93 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -568,7 +568,7 @@
 		                            </notebook>
 		                        </form>
 		                    </field>
-		                    <button string="Add New Note"
+		                    <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
index 9a8d4f2d4f3..6bdf472cd97 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -9,7 +9,7 @@ AVAILABLE_STATES = crm.AVAILABLE_STATES + [('unchanged', 'Unchanged')]
 class crm_add_note(osv.osv_memory):
     """Adds a new note to the case."""
     _name = 'crm.add.note'
-    _description = "Add New Note"
+    _description = "Add Internal Note"
 
     _columns = {
         'body': fields.text('Note Body', required=True),
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index adc3045893c..834b284e2ba 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -205,7 +205,7 @@
                                         </notebook>
                                     </form>
                                 </field>
-                                <button string="Add New Note"
+                                <button string="Add Internal Note"
                                     name="%(crm.action_crm_add_note)d"
                                     context="{'model': 'crm.lead' }"
                                     icon="terp-document-new" type="action" />
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 38c53fa89b7..0fb1e34942a 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -197,7 +197,7 @@
                                     </notebook>
                                 </form>
                             </field>
-                             <button string="Add New Note"
+                             <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f7c89620f29..2abd5d0eff9 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -134,7 +134,7 @@
                                     </notebook>
                                 </form>
                             </field>
-                             <button string="Add New Note"
+                             <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 352e7a710fd..c791b0baefd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -409,7 +409,7 @@
                                     </notebook>
                                 </form>
                             </field>
-                             <button string="Add New Note"
+                             <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 6a824570b39..fa41e0f2b11 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -186,7 +186,7 @@
                                 </notebook>
                             </form>
                         </field>
-                         <button string="Add New Note"
+                         <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index ac8ffc5b721..5ee8ba368fe 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -117,7 +117,7 @@
                                 </form>
                             </field>
                            <separator colspan="4"/>
-                            <button string="Add New Note"
+                            <button string="Add Internal Note"
                                 name="%(crm.action_crm_add_note)d"
                                 context="{'model': 'crm.lead' }"
                                 icon="terp-document-new" type="action" />

From cb99949fa35274d412ee1e0d1bec1b958936c9d0 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Mon, 20 Sep 2010 18:40:53 +0530
Subject: [PATCH 40/71] [IMP]: crm, mailgateway: Reverted changes to make
 history read/write

bzr revid: rpa@tinyerp.com-20100920131053-3w7jwvxw78i7dhn5
---
 addons/crm/crm_lead_view.xml        | 51 ++++++++++++++++-------------
 addons/mail_gateway/mail_gateway.py | 32 +++++++++---------
 2 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2206e536d0e..be19973b8bf 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -171,36 +171,41 @@
                     </group>
                  </page>
                  <page string="History" groups="base.group_extended">
-                    <group colspan="4">
-                        <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
-                    </group>
-                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form" context="{'default_model': 'crm.lead', 'default_user_id': uid}" >
-                        <tree string="History">
+                   <group colspan="4">
+                       <field colspan="4" name="email_cc" string="Global CC" widget="char" size="512"/>
+                   </group>
+                    <field name="message_ids" colspan="4" nolabel="1" mode="tree,form">
+                        <tree string="Communication history">
                             <field name="display_text" string="History Information"/>
                             <field name="history" invisible="1"/>
-                            <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" name="123" context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}" icon="terp-mail-replied" type="action"/>
+                            <button
+                                string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
+                                name="%(crm.action_crm_send_mail)d"
+                                context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                icon="terp-mail-replied" type="action" />
                         </tree>
-                        <form string="History">
-                            <field name="history"/>
-                            <field name="name" colspan="4" widget="char" size="512" required="1"/>
-                            <field name="date" required="1"/>
-                            <field name="user_id"/>
-                            <field name="model" invisible="1"/>
+                        <form string="Communication history">
+                            <group col="4" colspan="4">
+                                <field name="email_from"/>
+                                <field name="date"/>
+                                <field name="email_to" widget="char" size="512"/>
+                                <field name="email_cc" widget="char" size="512"/>
+                                <field name="name" colspan="4" widget="char" size="512"/>
+                                <field name="history" invisible="1"/>
+                            </group>
                             <notebook colspan="4">
                                 <page string="Details">
-                                    <group col="4" colspan="4" attrs="{'invisible': [('history', '!=', True)]}">
-                                        <field name="email_from" attrs="{'required': [('history', '=', True)]}"/>
-                                        <field name="email_to" widget="char" size="512"  attrs="{'required': [('history', '=', True)]}"/>
-                                        <field name="email_cc" widget="char" size="512"/>
+                                    <group attrs="{'invisible': [('history', '!=', True)]}">
+                                        <field name="description" colspan="4" nolabel="1" height="250"/>
+                                        <button colspan="4"
+                                            string="Reply"
+                                            name="%(crm.action_crm_send_mail)d"
+                                            context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
+                                            icon="terp-mail-replied" type="action" />
                                     </group>
-                                    <separator string="Description" colspan="4"/>
-                                     <group colspan="4" attrs="{'invisible': [('history', '!=', True)]}">
-                                        <field name="description" colspan="4" nolabel="1" attrs="{'required': [('history', '=', True)]}"/>
+                                    <group attrs="{'invisible': [('history', '=', True)]}">
+                                        <field name="display_text" colspan="4" nolabel="1"  height="250"/>
                                     </group>
-                                    <group colspan="4" attrs="{'invisible': [('history', '=', True)]}">
-                                        <field name="display_text" colspan="4" nolabel="1"/>
-                                    </group>
-                                    <button colspan="4" string="Reply" name="123" context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}" icon="terp-mail-replied" type="action"/>
                                 </page>
                                 <page string="Attachments">
                                     <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 98a03564785..c8d75a3a873 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -214,23 +214,23 @@ class mailgate_message(osv.osv):
     _description = 'Mailgateway Message'
     _order = 'date desc'
     _columns = {
-        'name':fields.text('Subject'),
-        'model': fields.char('Object Name', size=128, select=1),
-        'res_id': fields.integer('Resource ID', select=1),
-        'ref_id': fields.char('Reference Id', size=256, help="Message Id in Email Server.", select=True),
-        'date': fields.datetime('Date'),
-        'history': fields.boolean('Is History?'),
-        'user_id': fields.many2one('res.users', 'User Responsible'),
-        'message': fields.text('Description'),
-        'email_from': fields.char('From', size=128, help="Email From"),
-        'email_to': fields.char('To', help="Email Recipients", size=256),
-        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256),
-        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256),
-        'message_id': fields.char('Message Id', size=1024, help="Message Id on Email.", select=True),
-        'references': fields.text('References', help="References emails."),
-        'description': fields.text('Description'),
+        'name':fields.text('Subject', readonly=True),
+        'model': fields.char('Object Name', size=128, select=1, readonly=True),
+        'res_id': fields.integer('Resource ID', select=1, readonly=True),
+        'ref_id': fields.char('Reference Id', size=256, readonly=True, help="Message Id in Email Server.", select=True),
+        'date': fields.datetime('Date', readonly=True),
+        'history': fields.boolean('Is History?', readonly=True),
+        'user_id': fields.many2one('res.users', 'User Responsible', readonly=True),
+        'message': fields.text('Description', readonly=True),
+        'email_from': fields.char('From', size=128, help="Email From", readonly=True),
+        'email_to': fields.char('To', help="Email Recipients", size=256, readonly=True),
+        'email_cc': fields.char('Cc', help="Carbon Copy Email Recipients", size=256, readonly=True),
+        'email_bcc': fields.char('Bcc', help='Blind Carbon Copy Email Recipients', size=256, readonly=True),
+        'message_id': fields.char('Message Id', size=1024, readonly=True, help="Message Id on Email.", select=True),
+        'references': fields.text('References', readonly=True, help="References emails."),
+        'description': fields.text('Description', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', required=False),
-        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
+        'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
         'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
     }
 

From 370ec5aac491eeefd8a39f31eedb87ce3fe72e40 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Mon, 20 Sep 2010 19:29:10 +0530
Subject: [PATCH 41/71] [IMP] crm_fundraising:-useability improvements as
 defined on etherpad

bzr revid: mtr@mtr-20100920135910-1lcgn6fb87ze59ev
---
 .../report/crm_fundraising_report.py          | 18 ++++--
 .../report/crm_fundraising_report_view.xml    | 55 +++++++++++--------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/addons/crm_fundraising/report/crm_fundraising_report.py b/addons/crm_fundraising/report/crm_fundraising_report.py
index 8ab9e0f94be..81c2b70c2d6 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report.py
+++ b/addons/crm_fundraising/report/crm_fundraising_report.py
@@ -61,6 +61,10 @@ class crm_fundraising_report(osv.osv):
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         'company_id': fields.many2one('res.company', 'Company'),
+        'type_id': fields.many2one('crm.case.resource.type', 'Fundraising Type', \
+                             domain="[('section_id','=',section_id),\
+                             ('object_id.model', '=', 'crm.fundraising')]"),
+         'planned_cost': fields.float('Planned Costs',readonly=True,digits=(16,2)),
     }
 
     def init(self, cr):
@@ -74,26 +78,28 @@ class crm_fundraising_report(osv.osv):
             create or replace view crm_fundraising_report as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date, 'YYYY') as name,
+                    to_char(c.date, 'MM') as month,
+                    to_char(c.date, 'YYYY-MM-DD') as day,
                     c.state,
                     c.user_id,
                     c.section_id,
                     c.categ_id,
+                    c.type_id,
                     c.company_id,
                     c.partner_id,
                     count(*) as nbr,
                     date_trunc('day',c.create_date) as create_date,
                     sum(planned_revenue) as amount_revenue,
+                    sum(planned_cost) as planned_cost,
                     sum(planned_revenue*probability)::decimal(16,2) as amount_revenue_prob,
                     avg(probability)::decimal(16,2) as probability,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
                 from
                     crm_fundraising c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
-                     c.state, c.user_id,c.section_id,c.categ_id,c.partner_id,c.company_id,
-                     c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
+                group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),\
+                     c.state, c.user_id,c.section_id,c.categ_id,type_id,c.partner_id,c.company_id,
+                     c.create_date,to_char(c.date, 'YYYY-MM-DD')
             )""")
 
 crm_fundraising_report()
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 8e9f1611af6..15f06706bed 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.fundraising.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            	<tree colors="blue:state in ('draft');black:state in ('open','pending');gray:state in ('done','cancel') " string="Fundraising">
+            	<tree string="Fundraising">
 	              	<field name="name" invisible="1"/>
 					<field name="month" invisible="1"/>
 					<field name="section_id" invisible="1"/>
@@ -17,6 +17,7 @@
     				<field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                 	<field name="nbr" string='#Fundraising' sum="#Fundraising"/>
+                	<field name="planned_cost"  sum='Planned Costs'/>
                     <field name="amount_revenue"  sum='Est.Revenue'/>
                     <field name="probability" avg='Avg. Probability' widget="progressbar"/>
                     <field name="amount_revenue_prob" sum='Est. Rev*Prob.'/>
@@ -24,6 +25,7 @@
                     <field name="state" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="day" invisible="1"/>
+                    <field name="type_id" invisible="1"/>
                </tree>
             </field>
 
@@ -74,14 +76,17 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="This Year" icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                   		<filter string="  Year  " icon="terp-go-year"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                   			help="Funds raised in last 365 days"/>
 
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                    	   help="Funds raised in last 30 days"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Funds raised in the previous month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -97,7 +102,6 @@
                    		<separator orientation="vertical" />
                    		<field name="section_id"
                    			default="context.get('section_id', False)"
-                   			widget="selection"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
@@ -106,46 +110,51 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
+                   		<field name="company_id">
                            <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1" widget="selection">
+                      	<field name="user_id" select="1">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
                    <group  expand="0" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-personal+"
+                        <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
 
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
-
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
-
+                        <filter string="Payment Mode" help="Payment Mode"
+                            icon="terp-dolar" domain="[]"
+                            context="{'group_by':'type_id'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+                            
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
+                            domain="[]" context="{'group_by':'day'}"
+                            help="Day on which fund is raised"/>
 
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" 
+                            help="Month in which fund is raised"/>
 
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" 
+                            help="Year in which fund is raised"/>
 
                   </group>
                    <newline/>
@@ -170,7 +179,7 @@
 <!-- Fundraising by user and section Action -->
 
         <record id="action_report_crm_fundraising" model="ir.actions.act_window">
-            <field name="name">Fundraising</field>
+            <field name="name">Fundraising Analysis</field>
             <field name="res_model">crm.fundraising.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>

From 088dea3091880c7363537fefabeda69c3b4da47e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 21 Sep 2010 12:29:49 +0530
Subject: [PATCH 42/71] [IMP]: Minor improvements in configuration wizard
 tooltip

bzr revid: rpa@tinyerp.com-20100921065949-pwngcf1catotm57i
---
 addons/base_setup/installer.py    | 4 ++--
 addons/crm/crm_installer.py       | 8 ++++----
 addons/hr/installer.py            | 2 +-
 addons/mrp/installer.py           | 2 +-
 addons/profile_tools/installer.py | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 77303336ab7..76d07bfae11 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -59,7 +59,7 @@ class base_setup_installer(osv.osv_memory):
             help="Helps you manage your purchase-related processes such as "
                  "requests for quotations, supplier invoices, etc..."),
         'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more"),
+            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
         'point_of_sale':fields.boolean('Point of Sales',
             help="Helps you get the most out of your points of sales with "
                  "fast sale encoding, simplified payment mode encoding, "
@@ -75,7 +75,7 @@ class base_setup_installer(osv.osv_memory):
         # Vertical modules
         'product_expiry':fields.boolean('Food Industry',
             help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry"),
+                "which will help you manage your industry."),
         'association':fields.boolean('Associations',
             help="Installs a preselected set of OpenERP "
                  "applications which will help you manage your association "
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
index 3b1aae09bd0..3860a69b51c 100644
--- a/addons/crm/crm_installer.py
+++ b/addons/crm/crm_installer.py
@@ -38,10 +38,10 @@ class crm_installer(osv.osv_memory):
         'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
         'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
         'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale from opportunity cases in the CRM."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP / IMAP server"),
-        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
-        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one"),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application"),
+        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Thunderbird', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'outlook': fields.boolean('MS-Outlook', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
diff --git a/addons/hr/installer.py b/addons/hr/installer.py
index 8a4a6aeb58f..1d650d814e9 100644
--- a/addons/hr/installer.py
+++ b/addons/hr/installer.py
@@ -44,7 +44,7 @@ class hr_installer(osv.osv_memory):
         'hr_attendance': fields.boolean('Attendances',
             help="Simplifies the management of employee's attendances."),
         'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system"),
+            help="Generic Payroll system."),
         'hr_payroll_account': fields.boolean('Payroll Accounting',
             help="Generic Payroll system Integrated with Accountings."),
         }
diff --git a/addons/mrp/installer.py b/addons/mrp/installer.py
index b39ddb63eef..407d401e463 100644
--- a/addons/mrp/installer.py
+++ b/addons/mrp/installer.py
@@ -28,7 +28,7 @@ class mrp_installer(osv.osv_memory):
         # Manufacturing Resource Planning
         'stock_location': fields.boolean('Advanced Routes',
             help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)"),
+                 "locations (e.g. warehouses)."),
         'mrp_jit': fields.boolean('Just In Time Scheduling',
             help="Enables Just In Time computation of procurement orders."
                  "\n\nWhile it's more resource intensive than the default "
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 1e2ff655353..06be50a903f 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -25,9 +25,9 @@ class misc_tools_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents'),
-        'survey':fields.boolean('Survey',help='Manages Custom Surveys'),
+        'lunch':fields.boolean('Lunch',help='Helps to manage Lunch Orders.'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to add subscription on documents.'),
+        'survey':fields.boolean('Survey',help='Manages Custom Surveys.'),
         'idea':fields.boolean('Idea',help='Manages ideas and votes'),
         'audittrail':fields.boolean('Audit Trail',help="Lets you to track user's operations on specific Objects."),
     }

From cf165abb1bdfeb2eff7ab0d725cc8cc359537eda Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 21 Sep 2010 12:44:05 +0530
Subject: [PATCH 43/71] [FIX]: crm: normal CRM User can not create/write
 meetings

bzr revid: rpa@tinyerp.com-20100921071405-crcj4ngz4gz0i0hv
---
 addons/crm/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 7179a8ffdad..e68fe873b6c 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -10,7 +10,7 @@
 "access_crm_phonecall_system","crm.phonecall.system","model_crm_phonecall","base.group_system",1,0,0,0
 "access_crm_phonecall_manager","crm.phonecall.manager","model_crm_phonecall","base.group_sale_manager",1,0,0,0
 "access_crm_case_categ","crm.case.categ","model_crm_case_categ","base.group_user",1,0,0,0
-"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,1,1,0
+"access_crm_meeting","crm.meeting","model_crm_meeting","base.group_sale_salesman",1,0,0,0
 "access_crm_meeting_all","crm.meeting_allll","model_crm_meeting","base.group_user",1,0,0,0
 "access_crm_lead","crm.lead","model_crm_lead","base.group_sale_salesman",1,1,1,1
 "access_crm_lead.all","crm.lead.all","model_crm_lead","base.group_user",1,0,0,0

From f78d6f2b50f135558f13d63fe4a8dc76e1797089 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 21 Sep 2010 12:47:53 +0530
Subject: [PATCH 44/71] [IMP] crm_claim:-useability improvements in
 Reporting/Claim Analysis

bzr revid: mtr@mtr-20100921071753-cozn5vkd9u5c8wn4
---
 addons/crm_claim/report/crm_claim_report.py   | 18 ++--
 .../report/crm_claim_report_view.xml          | 83 ++++++++++---------
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index fed4026aa02..e0dc7244f14 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -74,6 +74,8 @@ class crm_claim_report(osv.osv):
         'type_id': fields.many2one('crm.case.resource.type', 'Claim Type',\
                          domain="[('section_id','=',section_id),\
                          ('object_id.model', '=', 'crm.claim')]"),
+        'date_closed': fields.date('Closed', readonly=True), 
+        'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
     }
 
     def init(self, cr):
@@ -87,9 +89,10 @@ class crm_claim_report(osv.osv):
             create or replace view crm_claim_report as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date, 'YYYY') as name,
+                    to_char(c.date, 'MM') as month,
+                    to_char(c.date, 'YYYY-MM-DD') as day,
+                    to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
                     c.state,
                     c.user_id,
                     c.stage_id,
@@ -101,13 +104,14 @@ class crm_claim_report(osv.osv):
                     c.priority as priority,
                     c.type_id as type_id,
                     date_trunc('day',c.create_date) as create_date,
-                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close
+                    avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
                     crm_claim c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'), \
+                group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
                         c.state, c.user_id,c.section_id, c.stage_id,\
-                        c.categ_id,c.partner_id,c.company_id,c.create_date,to_char(c.create_date, 'YYYY-MM-DD')
-                        ,c.priority,c.type_id
+                        c.categ_id,c.partner_id,c.company_id,c.create_date,
+                        c.priority,c.type_id,c.date_deadline,c.date_closed
             )""")
 
 crm_claim_report()
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 3a1e8f45f26..c003105ee8a 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -19,6 +19,7 @@
                     <field name="day" invisible="1"/>
 					<field name="nbr" string="#Claim" sum="#Claim"/>
 	                <field name="delay_close" avg="Avg Closing Delay"/>
+	                <field name="delay_expected"/>
 	                <field name="state" invisible="1"/>
 	                <field name="stage_id" invisible="1"/>
 	                <field name="categ_id" invisible="1"/>
@@ -42,6 +43,7 @@
 					<field name="section_id" select="1"/>
                     <field name="nbr" select="1"/>
                     <field name="delay_close"/>
+                    <field name="delay_expected"/>
                     <field name="amount_revenue"/>
                     <field name="amount_costs"/>
                     <field name="amount_revenue_prob"/>
@@ -75,14 +77,17 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="This Year" icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                   		<filter string="  Year  " icon="terp-go-year"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                   			help="Claims created in last 365 days"/>
 
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                    	   help="Claims created in last 30 days"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Claims created in the previous month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -98,7 +103,6 @@
                    		<separator orientation="vertical" />
                    		<field name="section_id"
                    			default="context.get('section_id', False)"
-                   			widget="selection"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
@@ -107,58 +111,58 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
+                   		<field name="company_id">
                            <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1" widget="selection">
+                      	<field name="user_id" select="1">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
                    <group  expand="0" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-
-                        <filter string="Section" icon="terp-personal+"
+                        <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
+                            
                         <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-
                         <filter string="Stage" icon="terp-stage" domain="[]"
                              context="{'group_by':'stage_id'}" />
-
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]"
+                             context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
 
                         <separator orientation="vertical"/>
-                         <filter string="Priority" icon="terp-rating-rated" domain="[]"
-                             context="{'group_by':'priority'}" />
-                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
                              context="{'group_by':'type_id'}" />
-
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                            domain="[]" context="{'group_by':'state'}" />
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home"
+                            domain="[]"
+                            context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
+                            domain="[]" context="{'group_by':'day'}"
+                            help="Date of claim"/>
 
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" 
+                            help="Month of claim"/>
 
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" 
+                            help="Year of claim"/>
                   </group>
                    <newline/>
-                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                   <group expand="0" string="Extended Filters..." groups="base.group_extended">
                          <filter icon="terp-dialog-close"
                     		string="Done"
                     		domain="[('state','=','done')]"/>
@@ -166,15 +170,16 @@
                     	<filter icon="gtk-cancel"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
-
-                    	<group>
-		            	    <separator orientation="vertical"/>
-		            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-			                <separator orientation="vertical"/>
-			                <field name="priority" />
-			                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
-		                </group>
+                    	<separator orientation="vertical"/>
+                    	<field name="partner_id"/>
+                    	<separator orientation="vertical"/>
+	            	    <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+		                <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+		                <separator orientation="vertical"/>
+		                <field name="priority" />
+		                <field name="type_id" widget="selection" domain="[('object_id.model', '=', 'crm.claim')]"/>
+	                    <newline/>
+                        <field name="date_closed"/>
                    </group>
                </search>
             </field>
@@ -183,7 +188,7 @@
 <!-- CRM Claim Report Action -->
 
         <record id="action_report_crm_claim" model="ir.actions.act_window">
-            <field name="name">Claims</field>
+            <field name="name">Claims Analysis</field>
             <field name="res_model">crm.claim.report</field>
             <field name="view_type">form</field>
   			<field name="view_mode">tree,graph</field>

From c25f1f238b19f1f4378cd468d09ed92a46ebb931 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 21 Sep 2010 15:08:06 +0530
Subject: [PATCH 45/71] [IMP] crm:-useability improvements in Reporting/Phone
 Calls Analysis

bzr revid: mtr@mtr-20100921093806-zcyigx1pz9yv7gk2
---
 addons/crm/crm_phonecall.py                   |  6 +-
 addons/crm/report/crm_phonecall_report.py     | 14 ++---
 .../crm/report/crm_phonecall_report_view.xml  | 62 +++++++++----------
 3 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 18a6daa0c3c..59938f1a11d 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -50,11 +50,11 @@ class crm_phonecall(crm_case, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'), 
         'description': fields.text('Description'), 
         'state': fields.selection([
-                                    ('draft', 'Draft'), 
+                                    ('draft', 'Todo'), 
                                     ('open', 'Todo'), 
                                     ('cancel', 'Cancelled'), 
-                                    ('done', 'Done'), 
-                                    ('pending', 'Pending'),
+                                    ('done', 'Held'), 
+                                    ('pending', 'Not Held'),
                                 ], 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 00d13c7216c..a82dc15525f 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -24,11 +24,11 @@ import tools
 from crm import crm
 
 AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
+    ('draft','Todo'),
+    ('open','Todo'),
     ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
+    ('done', 'Held'),
+    ('pending','Not Held')
 ]
 
 
@@ -119,9 +119,9 @@ class crm_phonecall_report(osv.osv):
             create or replace view crm_phonecall_report as (
                 select
                     id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
-                    to_char(c.create_date, 'YYYY-MM-DD') as day,
+                    to_char(c.date, 'YYYY') as name,
+                    to_char(c.date, 'MM') as month,
+                    to_char(c.date, 'YYYY-MM-DD') as day,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 69402603d17..f717cc0ca6d 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.phonecall.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Phone calls">
+               <tree string="Phone calls">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -75,55 +75,53 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="8">
-                           <filter string="This Year" icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                           <filter string="  Year  " icon="terp-go-year"
+                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
 
-                       <filter string="This Month" icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="   Month   " icon="terp-go-month" name="This Month"
+                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"/>
 
                            <separator orientation="vertical" />
                         <filter icon="terp-check"
-                            string="Current"
-                            domain="[('state','in',('draft','oprn'))]"/>
-                        <filter icon="terp-hr"
+                            string="To Do"
+                            domain="[('state','in',('draft','open'))]"/>
+                        <filter icon="gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <filter icon="terp-sale"
+                        <filter icon="terp-dialog-close"
                             string="Done"
                             domain="[('state','=','done')]"/>
-
-                           <separator orientation="vertical" />
-                      <filter string="Stage" icon="terp-crm" domain="[]"
-                          context="{'group_by':'stage_id'}" />
-
-
-                               <filter icon="terp-personal+"
-                                   context="{'invisible_section': False}"
-                                   domain="[('section_id.user_id','=',uid)]"
-                                   help="My section" />
-
+                      <separator orientation="vertical" />
+                        <field name="section_id"
+                            default="context.get('section_id', False)"
+                            context="{'invisible_section': False}">               
+                       <filter icon="terp-personal+"
+                           context="{'invisible_section': False}"
+                           domain="[('section_id.user_id','=',uid)]"
+                           help="My section" />
+                        </field>   
                           <field name="user_id" select="1">
                             <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="User" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
+                        
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Type" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
@@ -133,11 +131,11 @@
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
+                            domain="[]" context="{'group_by':'day'}" help="Date of call"/>
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" help="Month of call"/>
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" help="Year of call"/>
                   </group>
 
                    <newline/>
@@ -145,7 +143,7 @@
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
                         <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field string="Type" name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                            <newline/>
@@ -160,7 +158,7 @@
 <!-- Phone calls by user and section Action -->
 
         <record id="action_report_crm_phonecall" model="ir.actions.act_window">
-            <field name="name">Phone Calls</field>
+            <field name="name">Phone Calls Analysis</field>
             <field name="res_model">crm.phonecall.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>

From 116c9a614a226093cecf532ab83cab2dfa3e68c3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 21 Sep 2010 15:10:22 +0530
Subject: [PATCH 46/71] [IMP]: sale: Minor typo

bzr revid: rpa@tinyerp.com-20100921094022-a88l3wypbb8ljk73
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6fabd70c6f0..cca2215b288 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1154,7 +1154,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to synchronise invoice and delivery operations."),
+        ], 'Picking Default Policy', required=True, help="The Shipping Policy is used to synchronise invoices and delivery operations."),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),

From 500cc0088e91c54e76da7ad34b025bc2c2f65c5d Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 21 Sep 2010 19:17:36 +0530
Subject: [PATCH 47/71] [IMP] crm:-useability improvements in Leads Analysis
 and Opportunities Analysis

bzr revid: mtr@mtr-20100921134736-6udg87kazch8rcu7
---
 addons/crm/report/crm_lead_report_view.xml | 47 ++++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index e6b2f6af4f1..1e52b7a4f6b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.lead.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state in ('draft');black:state in ('open','pending','done');gray:state in ('cancel') " string="Leads Analysis">
+            <tree string="Leads Analysis">
                 <field name="name" invisible="1"/>
                 <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
@@ -21,12 +21,12 @@
                 <field name="user_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
-                <field name="delay_expected"/>
                 <field name="avg_answers"/>
              </tree>
             </field>
@@ -69,31 +69,35 @@
             <field name="arch" type="xml">
                 <search string="Leads Analysis">
                     <group col="20" colspan="8">
-                        <filter string="Last 365 Days" icon="terp-go-year"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter string="Last 30 Days" icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
-                        <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                        <filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Leads/Opportunities created in last 365 days"/>
+                        <filter string="   Month   " icon="terp-go-month" name="this_month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Leads/Opportunities created in last 30 days"/>
+                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Leads/Opportunities created in the previous month"/>
+                            
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Current"
                             domain="[('state','in',('draft','open'))]"/>
-                        <filter icon="terp-check"
+                        <filter icon="gtk-media-pause"
                             string="Pending"
                             domain="[('state','=','pending')]"/>
-                        <filter icon="terp-check"
+                        <filter icon="terp-dialog-close"
                             string="Closed"
                             domain="[('state','=','done')]"/>
+                            
                         <separator orientation="vertical" />
                         <field name="section_id"
                             default="context.get('section_id', False)"
-                            widget="selection"
                             context="{'invisible_section': False}">
                             <filter icon="terp-crm"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
-                                help="My section" />
+                                help="My team" />
                         </field>
                         <field name="user_id">
                             <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
@@ -101,20 +105,19 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="user" icon="terp-personal"
+                        <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+"
+                            domain="[]"
+                            context="{'group_by':'section_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-personal+"
-                            domain="[]"
-                            context="{'group_by':'section_id'}" />
-                        <filter string="Category" icon="terp-stock_symbol-selection"
-                            domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Category" icon="terp-stock_symbol-selection"
+                            domain="[]" context="{'group_by':'categ_id'}" />
                         <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                             domain="[]" context="{'group_by':'state'}" />
@@ -124,11 +127,11 @@
                             context="{'group_by':'company_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}"/>
+                            domain="[]" context="{'group_by':'day'}" help="Day on which lead/opportunity is created"/>
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
+                            domain="[]" context="{'group_by':'month'}" help="Month in which lead/opportunity is created"/>
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" help="Year in which lead/opportunity is created"/>
                   </group>
                   <newline/>
                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">

From 3cde22c2a2618f4b5db8f68f558e93a71a98f6d6 Mon Sep 17 00:00:00 2001
From: "RHA (OpenERP)" <>
Date: Wed, 22 Sep 2010 13:28:44 +0530
Subject: [PATCH 48/71] [IMP]: Usability improvements

bzr revid: rvo@tinyerp.co.in-20100922075844-jpygvjk9pvix569t
---
 addons/project/project.py                     |  2 +-
 addons/project/project_view.xml               | 12 +++---
 addons/project/report/project_report.py       |  2 +-
 addons/project/report/project_report_view.xml | 27 ++++++------
 addons/project_gtd/project_gtd.py             |  2 +-
 addons/project_gtd/project_gtd_view.xml       |  4 +-
 addons/project_issue/project_issue_menu.xml   |  2 +-
 addons/project_issue/project_issue_view.xml   |  4 +-
 .../report/project_issue_report_view.xml      | 41 +++++++++----------
 .../project_long_term_view.xml                | 18 ++++----
 .../project_messages_view.xml                 |  2 +-
 addons/project_scrum/project_scrum_view.xml   |  8 ++--
 addons/resource/resource_view.xml             | 29 +++++++------
 13 files changed, 78 insertions(+), 75 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 4b43a37a76f..76ff7c5afa0 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -417,7 +417,7 @@ class task(osv.osv):
         'active': fields.function(_is_template, method=True, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', size=128, required=True),
         'description': fields.text('Description'),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Importance'),
+        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'), ('0','Very urgent')], 'Priority'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type_id': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bf801adca1d..1c854649535 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -302,7 +302,9 @@
                     <field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]"/>
                     <field name="user_id"/>
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
+                    <field name="planned_hours"/>
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="delay_hours"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <button name="next_type" invisible="context.get('set_visible',False)"
@@ -387,7 +389,7 @@
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                         </field>
                         <field name="user_id" select="1">
-                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal" separator="1"/>
+                            <filter domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" separator="1"/>
                         </field>
                     </group>
                     <newline/>
@@ -486,10 +488,10 @@
         <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="base.group_system"/>
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
 
-        <act_window domain="[('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"/>
+        <act_window context="{'search_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"/>
 
         <act_window
-            domain="[('project_id', '=', active_id)]"
+        	context="{'search_default_project_id': [active_id]}"
             id="act_project_project_2_project_task_all"
             name="Tasks"
             res_model="project.task"
@@ -537,7 +539,7 @@
             </page>
        </field>
     </record>
-    <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
-    <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id]}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+    <act_window context="{'search_default_user_id': [active_id]}" domain="[('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
     </data>
 </openerp>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index b9c22faee8b..e411248db4b 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -49,7 +49,7 @@ class report_project_task_user(osv.osv):
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
-('0','Very urgent')], 'Importance', readonly=True),
+('0','Very urgent')], 'Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'State', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 7e17494a5d4..93f59cd38bd 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -58,18 +58,18 @@
             <field name="arch" type="xml">
                 <search string="Tasks Analysis">
                 	<group colspan="10" col="12">
-	                    <filter icon="terp-go-year" string="  365 Days  "
+	                    <filter icon="terp-go-year" string="  Year  "
 	                    	    domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
-	                    	    help="Tasks performed in last 365 Days"/>
-	                    <filter icon="terp-go-month" string="   30 Days   "
+	                    	    help="Current Year"/>
+	                    <filter icon="terp-go-month" string="   Month   "
 	                    		name="month"
 	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
-	                    		help="Tasks performed in last 30 days"/>
+	                    		help="Current Month"/>
 		                <filter icon="terp-go-week"
-	                            string="    7 Days    "
+	                            string="    Month-1    "
 	                            separator="1"
 	                            domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-	                            help="Tasks during last 7 days"/>
+	                            help="Previous Month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
 	                    		icon="terp-document-new"
@@ -111,26 +111,25 @@
                         <filter string="Project" name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}"/>
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Stage" icon="terp-stage" context="{'group_by':'type_id'}" />
                         <separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
+                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Current Day"/>
+                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Current Month"/>
+                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Current Year"/>
                     </group>
                     <newline/>
 	                <group expand="0" string="Extended Filters..." colspan="10" col="12" groups="base.group_extended">
+	                	<field name="priority" string="Priority"/>
 	                    <field name="type_id" widget="selection"/>
-	                    <separator orientation="vertical"/>
+	                    <newline/>
                         <field name="date_start"/>
-                        <field name="date_deadline"/>
                         <field name="date_end"/>
-	                    <separator orientation="vertical"/>
-	                    <field name="priority"/>
+                        <field name="date_deadline"/>
 	                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </search>
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 46031048ae9..f29780126e0 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -114,7 +114,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" string="%s"/>''' % (_('Inbox'),)
+            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 += '''<separator orientation="vertical"/>'''
             for time in tt:
                 if time.icon:
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 5672fdafa7c..99e87fcb325 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -19,7 +19,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Context">
-                <field name="name"/>
+                <field name="name" select="1"/>
                 <field name="sequence"/>
             </form>
         </field>
@@ -53,7 +53,7 @@
         <field name="arch" type="xml">
             <form string="Timeboxes">
                 <separator string="Timebox Definition" colspan="4"/>
-                <field name="name"/>
+                <field name="name" select="1"/>
                 <field name="sequence"/>
                 <field name="icon"/>
             </form>
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 514fd59c8d6..df76e808bff 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -40,7 +40,7 @@
     </record>
 
     <act_window
-            domain="[('project_id', '=', active_id)]"
+    		context="{'search_default_project_id': [active_id]}"
             id="act_project_project_2_project_issue_all"
             name="Issues"
             res_model="project.issue"
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 7fc2db7c775..46a6e2d44c9 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -163,7 +163,7 @@
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="project_id" />
-                    <field name="priority" string="Severity"/>
+                    <field name="priority" string="Priority"/>
                     <field name="stage_id" string="Resolution"/>
                     <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
@@ -261,7 +261,7 @@
                     <field name="id"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
-                    <field name="priority" string="Severity"/>
+                    <field name="priority" string="Priority"/>
                     <field name="stage_id" string="Resolution"/>
                     <button icon="gtk-go-back" string="" name="stage_previous" type="object"
                         states="open,draft,pending,done,cancel" />
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index c80ccc86e28..5dd6242137b 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -54,14 +54,14 @@
             <field name="arch" type="xml">
 				<search string="Search">
                   <group col="16" colspan="8">
-                   		<filter string="365 Days" icon="terp-go-year"
-                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+                   		<filter string="Year" icon="terp-go-year"
+                   			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" help="Current Year"/>
 
-                       <filter string="30 Days" icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter string="Month" icon="terp-go-month" name="This Month"
+                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]" help="Current Month"/>
 
-                       <filter icon="terp-go-week" string="7 Days" separator="1"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-week" string="Month-1" separator="1"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]" help="Previous Month"/>
 
                    		<separator orientation="vertical" />
                         <filter  icon="terp-camera_test"
@@ -76,6 +76,7 @@
 
                    		<separator orientation="vertical" />
                    		<field name="section_id"
+                   			string="Sale Team	"
                    			default="context.get('section_id', False)"
                    			widget="selection"
                    			context="{'invisible_section': False}">
@@ -91,42 +92,40 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
-                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <separator orientation="vertical" />
-                        <filter name="User" string="Responsible" icon="terp-personal"
+                   		<filter name="User" string="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Assigned to" name="Responsible" icon="terp-personal"
                         domain="[]" context="{'group_by':'assigned_to'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
-                        <separator orientation="vertical" />
-                        <filter string="Section" icon="terp-sale"
+                        <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
+						<separator orientation="vertical" />
+						<filter string="Sale Team" icon="terp-personal+"
                         	domain="[]"
                         	context="{'group_by':'section_id'}" />
+						<separator orientation="vertical" />
+                        <filter string="Project"  name="project" icon="terp-folder-blue" context="{'group_by':'project_id'}" />
+                        <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
+                        <separator orientation="vertical" />
                         <filter string="Category" icon="terp-stock_symbol-selection"
                         	domain="[]" context="{'group_by':'categ_id'}" />
-                        <separator orientation="vertical" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+						<separator orientation="vertical" />
+						<filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <separator orientation="vertical" />
                         <filter string="State" icon="terp-stock_effects-object-colorize"
                         	domain="[]" context="{'group_by':'state'}" />
                         <separator orientation="vertical"/>
                         <filter string="Company" icon="terp-go-home"
                         	domain="[]"
                         	context="{'group_by':'company_id'}" />
-
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                        	domain="[]" context="{'group_by':'day'}"/>
+                        	domain="[]" context="{'group_by':'day'}" help="Current Day"/>
 
                         <filter string="Month" icon="terp-go-month"
-                        	domain="[]" context="{'group_by':'month'}" />
+                        	domain="[]" context="{'group_by':'month'}" help="Current Month"/>
 
                         <filter string="Year" icon="terp-go-year"
-                        	domain="[]" context="{'group_by':'name'}" />
+                        	domain="[]" context="{'group_by':'name'}" help="Current Year"/>
 
                   </group>
                    <newline/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 132dc24ce4a..63cc512c92a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -93,17 +93,17 @@
 	                    <group colspan="2" col="2">
 	                        <field name="name" select="1"/>
 	                        <field name="date_start"/>
-	                        <field name="date_end"/>
 	                    </group>
-	                    <group colspan="2" col="2">
-	                       <field name="project_id" on_change="onchange_project(project_id)" />
-	                       <field name="duration" />
+	                    <group colspan="2" col="4">
+	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
+                           <newline/>
+	                       <field name="duration" colspan="1"/>
+                           <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
 	                    </group>
 	                    <group colspan="2" col="2">
 	                       <field name="responsible_id"/>
-	                       <newline/>
-	                       <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]" colspan="2"/>
-                    </group>
+	                       <field name="date_end"/>
+                    	</group>
 					</group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
@@ -306,10 +306,10 @@
         res_model="project.task"
         src_model="project.phase"
         view_mode="tree,form"
-        domain="[('phase_id','=',active_id)]"/>
+        context="{'search_default_phase_id': [active_id]}"/>
 
     <act_window
-        domain="[('project_id', '=', active_id)]"
+    	context="{'search_default_project_id': [active_id]}"
         id="act_project_phases"
         name="Phases"
         res_model="project.phase"
diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml
index 6780da6c694..456a0269c99 100644
--- a/addons/project_messages/project_messages_view.xml
+++ b/addons/project_messages/project_messages_view.xml
@@ -95,7 +95,7 @@
 			<field name="help">An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis.</field>
         </record>
 
-        <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
+        <act_window context="{'search_default_project_id': [active_id]}" id="act_project_messages" name="Messages" res_model="project.messages" src_model="project.project"/>
 
          <!--Actions for deshboard -->
 
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index f857c31d756..d145339e970 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -198,7 +198,7 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('pending');grey:state in ('cancel','done')" string="Scrum Sprint">
+                <tree colors="blue:state in ('draft','pending');grey:state in ('cancel','done')" string="Scrum Sprint">
                     <field name="name"/>
                     <field name="project_id"/>
                     <field name="scrum_master_id"/>
@@ -515,7 +515,7 @@
                 <field name="project_id" position="after">
                     <field name="sprint_id" context="{'sprint_invisible':False}">
                         <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints"/>
-                        <filter icon="terp-check" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
+                        <filter icon="gtk-find" string="Current" context="{'sprint_invisible':False}" domain="[]" help="View Sprints"/>
                     </field>
                 </field>
             </field>
@@ -536,7 +536,7 @@
         </record>
 
         <act_window
-            domain="[('sprint_id', '=', active_id)]"
+        	context="{'search_default_sprint_id': [active_id]}"
             id="act_scrum_sprint_2_product_backlog"
             name="Backlogs"
             res_model="project.scrum.product.backlog"
@@ -545,7 +545,7 @@
             view_type="form"/>
 
         <act_window
-            domain="[('sprint_id', '=', active_id)]"
+        	context="{'search_default_sprint_id': [active_id]}"
             id="act_scrum_sprint_2_project_task"
             name="Tasks"
             res_model="project.task"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index ba68ea09f65..de602a177af 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -41,10 +41,6 @@
                        <field name="manager"/>
                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
-                   <newline/>
-                   <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager'}"/>
-                    </group>
                </search>
             </field>
         </record>
@@ -56,7 +52,7 @@
             <field name="arch" type="xml">
                 <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Name"/>
+                       <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
                        <field name="calendar_id" string="Working Time" widget="selection"/>
@@ -214,13 +210,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Detail">
-                    <field name="name"/>
-                    <field name="resource_id"  on_change="onchange_resource(resource_id)"/>
-                    <field name="company_id"  widget="selection" groups="base.group_multi_company"/>
-                    <field name="calendar_id" widget="selection"/>
-                    <newline/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
+                    <group colspan="4" col="6">
+                       <group colspan="2" col="2">
+                           <field name="resource_id" on_change="onchange_resource(resource_id)"/>
+                           <field name="name" string="Reason"/>
+                       </group>
+                       <group colspan="2" col="2">
+                           <field name="date_from"/>
+                           <field name="calendar_id"/>
+                           <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       </group>
+                       <group colspan="2" col="2">
+                           <field name="date_to"/>
+                       </group>
+                   </group>
                 </form>
             </field>
         </record>
@@ -230,7 +233,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Leave Detail">
-                    <field name="name" />
+                    <field name="name" string="Reason"/>
                     <field name="resource_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="calendar_id" />

From e826dfeb698e37578e3176197b43e25f406fee6b Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Wed, 22 Sep 2010 13:36:45 +0530
Subject: [PATCH 49/71] [IMP]: Security, added ir.rule for Project Manager
 Group

bzr revid: rvo@tinyerp.co.in-20100922080645-81q0mireru2k6csf
---
 addons/project/security/project_security.xml      | 11 +++++++++++
 .../security/ir.model.access.csv                  | 15 ++++++++-------
 .../project_messages/security/ir.model.access.csv |  3 ++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f968ffc51a3..97453dcb33b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -6,6 +6,10 @@
         <field name="name">Project / Financial Manager</field>
     </record>
 
+    <record id="group_project_finance_user" model="res.groups">
+        <field name="name">Project / Financial User</field>
+    </record>
+
     <record id="group_project_manager" model="res.groups">
         <field name="name">Project / Manager</field>
     </record>
@@ -43,5 +47,12 @@
         <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','in', [user.id]),('project_id.user_id','=',user.id)]</field>
     </record>
 
+     <record model="ir.rule" id="project_details_comp_rule">
+        <field name="name" >Projects According to User</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="groups" eval="[(6, 0, [ref('group_project_manager')])]"/>
+        <field name="domain_force">[('user_id','=',user.id)]</field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 3653cd375f1..7af7984d7e6 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -1,9 +1,10 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_phase","project.phase","model_project_phase",project.group_project_user,1,1,1,0
-"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation",project.group_project_user,1,1,1,0
-"access_project_phase_manager","project.phase manager","model_project_phase",project.group_project_manager,1,0,0,0
-"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation",project.group_project_manager,1,0,0,0
-"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation",base.group_system,1,0,0,0
-"access_project_phase_system","project.phase system","model_project_phase",base.group_system,1,0,0,0
-"access_resource_resource_user","resource.resource user","resource.model_resource_resource",project.group_project_user,1,1,1,1
+"access_project_phase","project.phase","model_project_phase","project.group_project_user",1,1,1,0
+"access_project_resource_allocation","project.resource.allocation","model_project_resource_allocation","project.group_project_user",1,1,1,0
+"access_project_phase_manager","project.phase manager","model_project_phase","project.group_project_manager",1,0,0,0
+"access_project_resource_allocation_manager","project.resource.allocation manager","model_project_resource_allocation","project.group_project_manager",1,0,0,0
+"access_project_resource_allocation_system","project.resource.allocation system","model_project_resource_allocation","base.group_system",1,0,0,0
+"access_project_phase_system","project.phase system","model_project_phase","base.group_system",1,0,0,0
+"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,1,1
 "access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
+"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index b79a32fb2f5..fb0b4e8255a 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_project_messages","project.messages","model_project_messages",project.group_project_user,1,1,1,1
+"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
+"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1

From e067fa17a8ef9c2c74072f59edea4f78e688ae35 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 22 Sep 2010 14:42:25 +0530
Subject: [PATCH 50/71] [FIX] caldav: support caldav property

bzr revid: hmo@tinyerp.com-20100922091225-2uuaeibf1xi54ko9
---
 addons/caldav/caldav_node.py | 184 +++++++++++++++++++++++------------
 1 file changed, 120 insertions(+), 64 deletions(-)

diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
index 63e683bafb7..55be22f198e 100644
--- a/addons/caldav/caldav_node.py
+++ b/addons/caldav/caldav_node.py
@@ -103,7 +103,12 @@ class node_calendar_collection(nodes.node_dir):
 class node_calendar(nodes.node_class):
     our_type = 'collection'
     DAV_PROPS = {
-            "http://calendarserver.org/ns/" : ('getctag',),
+            "DAV:": ('principal-collection-set'),
+            "http://cal.me.com/_namespace/" : ('user-state'),
+            "http://calendarserver.org/ns/" : (
+                    'dropbox-home-URL',
+                    'notification-URL',
+                    'getctag',),
             'http://groupdav.org/': ('resourcetype',),
             "urn:ietf:params:xml:ns:caldav" : (
                     'calendar-description',
@@ -114,6 +119,7 @@ class node_calendar(nodes.node_class):
                     'schedule-outbox-URL',)}
     DAV_M_NS = {
            "DAV:" : '_get_dav',
+           "http://cal.me.com/_namespace/": '_get_dav', 
            'http://groupdav.org/': '_get_gdav',
            "http://calendarserver.org/ns/" : '_get_dav',
            "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
@@ -134,6 +140,35 @@ class node_calendar(nodes.node_class):
         result = self._get_ttag(cr) + ':' + str(time.time())
         return str(result)
 
+    def _get_dav_dropbox_home_URL(self, cr):
+        import xml.dom.minidom
+        import urllib
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
+        url = urllib.quote('/%s/%s' % (cr.dbname, res))
+        return url
+    
+    def _get_dav_notification_URL(self, cr):
+        import xml.dom.minidom
+        import urllib
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
+        url = urllib.quote('/%s/%s' % (cr.dbname, res))
+        return url
+
+    def _get_dav_user_state(self, cr):
+        #TODO
+        return True
+
+
     def get_dav_resourcetype(self, cr):
         res = [ ('collection', 'DAV:'),
                 (str(self.cal_type + '-collection'), 'http://groupdav.org/'),
@@ -258,6 +293,86 @@ class node_calendar(nodes.node_class):
     def rmcol(self, cr):
         return False
 
+    
+    def _get_caldav_calendar_data(self, cr):
+        res = []
+        for child in self.children(cr):
+            res.append(child._get_caldav_calendar_data(cr))
+        return res
+
+    def _get_caldav_calendar_description(self, cr):
+        uid = self.context.uid
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        return calendar.description
+
+    def _get_dav_principal_collection_set(self, uri):
+        import urllib
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
+        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
+        href = doc.documentElement
+        href.tagName = 'D:href'
+        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
+        href.appendChild(huri)
+        return href
+
+    def _get_caldav_calendar_home_set(self, cr):
+        import xml.dom.minidom
+        import urllib
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
+
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, calendar.collection_id.name)))
+        href = doc.documentElement
+        href.tagName = 'D:href'
+        href.appendChild(huri)
+        return href
+
+    def _get_caldav_calendar_user_address_set(self, cr):
+        import xml.dom.minidom
+        dirobj = self.context._dirobj
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        user_obj = self.context._dirobj.pool.get('res.users')
+        user = user_obj.browse(cr, uid, uid, context=ctx)
+        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
+        href = doc.documentElement
+        href.tagName = 'D:href'
+        huri = doc.createTextNode('MAILTO:' + str(user.email) or str(user.name))
+        href.appendChild(huri)
+        return href
+
+    def _get_caldav_schedule_outbox_URL(self, cr):
+        return self._get_caldav_schedule_inbox_URL(cr)
+
+    def _get_caldav_schedule_inbox_URL(self, cr):
+        import xml.dom.minidom
+        import urllib
+        uid = self.context.uid
+        ctx = self.context.context.copy()
+        ctx.update(self.dctx)
+        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
+        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
+        res = '%s/%s' %(calendar.collection_id.name, calendar.name)
+        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
+        href = doc.documentElement
+        href.tagName = 'D:href'
+        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
+        href.appendChild(huri)
+        return href
+
 
 class res_node_calendar(nodes.node_class):
     our_type = 'file'
@@ -309,6 +424,9 @@ class res_node_calendar(nodes.node_class):
         context.update({'model': self.model, 'res_id':self.res_id})
         res = calendar_obj.export_cal(cr, uid, [self.calendar_id], context=context)
         return res
+  
+    def _get_caldav_calendar_data(self, cr):
+        return self.get_data(cr)
 
     def get_data_len(self, cr, fil_obj = None):
         return self.content_length
@@ -327,67 +445,6 @@ class res_node_calendar(nodes.node_class):
             res = '%d' % (self.calendar_id)
         return res
 
-    def _get_caldav_calendar_data(self, cr):
-        return self.get_data(cr)
-
-
-    def _get_caldav_calendar_description(self, cr):
-        uid = self.context.uid
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        return calendar.description
-
-
-    def _get_caldav_calendar_home_set(self, cr):
-        import xml.dom.minidom
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, calendar.collection_id.name)))
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        href.appendChild(huri)
-        return href
-
-    def _get_caldav_calendar_user_address_set(self, cr):
-        import xml.dom.minidom
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        user_obj = self.context._dirobj.pool.get('res.users')
-        user = user_obj.browse(cr, uid, uid, context=ctx)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        huri = doc.createTextNode('MAILTO:' + user.email)
-        href.appendChild(huri)
-        return href
-
-
-    def _get_caldav_schedule_inbox_URL(self, cr):
-        import xml.dom.minidom
-        import urllib
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-        res = '%s/%s' %(calendar.name, calendar.collection_id.name)
-        doc = xml.dom.minidom.getDOMImplementation().createDocument(None, 'href', None)
-        href = doc.documentElement
-        href.tagName = 'D:href'
-        huri = doc.createTextNode(urllib.quote('/%s/%s' % (cr.dbname, res)))
-        href.appendChild(huri)
-        return href
-
 
     def rm(self, cr):
         uid = self.context.uid
@@ -401,7 +458,6 @@ class res_node_calendar(nodes.node_class):
 
         return res
 
-    def _get_caldav_schedule_outbox_URL(self, cr):
-        return self._get_caldav_schedule_inbox_URL(cr)
+   
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4

From 40cf6cc857dbe1fae1a755c5130ed0038da36f14 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 22 Sep 2010 16:08:20 +0530
Subject: [PATCH 51/71] [IMP] project: wizard should open if warn_manager or
 warn_customer on close task

bzr revid: hmo@tinyerp.com-20100922103820-nkap8mj0wnw51y0n
---
 addons/project/project.py                     | 20 +++++++++++++++++++
 addons/project/project_view.xml               |  8 ++++----
 addons/project/wizard/project_task_close.py   | 15 ++++----------
 .../wizard/project_task_close_view.xml        | 12 +++++------
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 76ff7c5afa0..de9f2230cb2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -519,6 +519,26 @@ class task(osv.osv):
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
+    def action_close(self, cr, uid, ids, context=None):
+        # This action open wizard to send email to partner or project manager after close task.
+        project_id = len(ids) and ids[0] or False
+        if not project_id: return False
+        task = self.browse(cr, uid, project_id, context=context)
+        project = task.project_id
+        res = self.do_close(cr, uid, [project_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': 'project.task.close',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True,
+                'context': {'active_id': task.id}
+           } 
+        return res
+
     def do_close(self, cr, uid, ids, context=None):
         """
         Close Task
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1c854649535..87e15fd27b1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,9 +112,9 @@
                    <newline />
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
                         <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'}" help="Parent Project"/>
+                        <filter string="Partner" name="Partner" icon="terp-partner" domain = "[]" context="{'group_by':'partner_id'}"/>
                          <separator orientation="vertical"/>
-                        <filter string="Parent" name="Parent"  icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Parent" name="Parent"  help="Parent Project" icon="terp-folder-blue" domain = "[]" context="{'group_by':'parent_id'}"/>
                     </group>
                </search>
             </field>
@@ -241,7 +241,7 @@
                                 <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
                                 <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
                                 <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
-                                <button name="%(action_project_task_close)d" states="pending,open" string="Done" type="action" icon="terp-dialog-close"/>
+                                <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
                                 <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -320,7 +320,7 @@
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
-                    <button name="%(action_project_task_close)d" states="draft,pending,open" string="Done" type="action" icon="gtk-apply" help="For changing to done state"/>
+                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>
             </field>
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 99b6caef308..78ffa5a8338 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -56,24 +56,18 @@ class project_task_close(osv.osv_memory):
         partner = task.partner_id or task.project_id.partner_id
         
         if 'description' in fields:
-            res.update({'description': task.description})
+            res.update({'description': task.description or False})
         if 'manager_warn' in fields:
-            res.update({'manager_warn': project.warn_manager})
+            res.update({'manager_warn': project.warn_manager or False})
         if 'partner_warn' in fields:
-            res.update({'partner_warn': project.warn_customer})
+            res.update({'partner_warn': project.warn_customer or False})
         if 'manager_email' in fields:
             res.update({'manager_email': manager and manager.user_email or False})
         if partner and len(partner.address) and 'partner_email' in fields:
             res.update({'partner_email': partner.address[0].email})
         return res
 
-    def done(self, cr, uid, ids, context=None):
-        task_pool = self.pool.get('project.task')
-        task_id = context.get('active_id', False)
-        res = task_pool.do_close(cr, uid, [task_id], context=context)
-        return res
-
-    def confirm(self, cr, uid, ids, context=None):
+    def send(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         
@@ -83,7 +77,6 @@ class project_task_close(osv.osv_memory):
             return {}
         task = task_pool.browse(cr, uid, task_id, context=context)
         for data in self.browse(cr, uid, ids, context=context):
-            res = task_pool.do_close(cr, uid, [task.id], context=context)
             if res:
                 # Send Warn Message by Email to Manager and Customer
                 if data.manager_warn and not data.manager_email:
diff --git a/addons/project/wizard/project_task_close_view.xml b/addons/project/wizard/project_task_close_view.xml
index 4e55d7af1c9..6c064784827 100644
--- a/addons/project/wizard/project_task_close_view.xml
+++ b/addons/project/wizard/project_task_close_view.xml
@@ -3,12 +3,11 @@
     <data>
 
     	<record id="view_project_task_close" model="ir.ui.view">
-            <field name="name">Done Task</field>
+            <field name="name">Send Email</field>
             <field name="model">project.task.close</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              	<form string="Done Task" >
-					  <separator string="Done Task and Inform to Project Manager or Customer by Email " colspan="4"/>
+              	<form string="Send Email" >
               		  <group colspan="4" col="4">
                             <field name="manager_warn" invisible="1"/>
 		                    <field name="manager_email" widget="email" attrs="{'invisible':[('manager_warn','=',False)], 'required':[('manager_warn','=',True)]}"/>
@@ -21,16 +20,15 @@
                       <group colspan="2" col="2">
                       </group>
 		              <group colspan="2" col="3">
-		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
-                            <button  icon="gtk-jump-to" string="_Done" special="cancel" name="done" type="object"/>
-		            		<button  icon="terp-mail-message-new" string="_Send+Done" name="confirm" type="object"/>
+		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+		            		<button  icon="terp-mail-message-new" string="_Send" name="send" type="object"/>
 		              </group>
 			  	</form>
             </field>
 		</record>
 
 		<record id="action_project_task_close" model="ir.actions.act_window">
-	           <field name="name">Done Task</field>
+	           <field name="name">Send Email</field>
 	           <field name="type">ir.actions.act_window</field>
 	           <field name="res_model">project.task.close</field>
 	           <field name="view_type">form</field>

From 04c771ac516d876e0f7243c007fb8c03be3e686c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 22 Sep 2010 17:06:56 +0530
Subject: [PATCH 52/71] [FIX]: caldav: Minor fix for exporting selection value

bzr revid: rpa@tinyerp.com-20100922113656-u3ccvvazvgmqx7h3
---
 addons/caldav/calendar.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index 01c35880fbb..4f9afb034a4 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -453,7 +453,7 @@ class CalDAV(object):
                             else:
                                 for key1, val1 in self.ical_get(field, 'mapping').items():
                                     if val1 == data[map_field]:
-                                        vevent.add(field).value = key1
+                                        vevent.add(field).value = key1.upper()
         return vevent
 
     def check_import(self, cr, uid, vals, context=None):

From 06c3a116233726ff020c06aee32ea8517335a29e Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 22 Sep 2010 17:56:36 +0530
Subject: [PATCH 53/71] [IMP]: account: History tab must come at the end
 immediately before notes field in partner view

bzr revid: rpa@tinyerp.com-20100922122636-qe9asbpt1pe0ej24
---
 addons/account/partner_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d53fb9fe80a..ca489acd9bd 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -72,7 +72,7 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="Notes" position="before">
+                <page string="History" position="before">
                 <page string="Accounting">
                     <group col="2" colspan="2">
                         <separator string="Customer Accounting Properties" colspan="2"/>

From b5d85ed4d8de023cd0a273f4bba3d51e78c2ee67 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 22 Sep 2010 19:13:27 +0530
Subject: [PATCH 54/71] [IMP] crm_helpdesk:-useability improvements in
 Reporting/Helpdesk Analysis

bzr revid: mtr@mtr-20100922134327-may3coayri4ppktb
---
 .../report/crm_helpdesk_report.py             | 31 ++++--
 .../report/crm_helpdesk_report_view.xml       | 96 +++++++++++--------
 2 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 70a3adc369e..27fc1ab3a78 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -50,12 +50,22 @@ class crm_helpdesk_report(osv.osv):
                                   ('07', 'July'), ('08', 'August'),\
                                   ('09', 'September'), ('10', 'October'),\
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
-        'delay_close': fields.char('Delay to close', size=20, readonly=True),
+        'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'date_deadline': fields.date('Deadline'),
         'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \
                     ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'),
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'categ_id': fields.many2one('crm.case.categ', 'Category', \
+                            domain="[('section_id','=',section_id),\
+                            ('object_id.model', '=', 'crm.helpdesk')]"),
+        'planned_cost': fields.float('Planned Costs'),
+        'create_date': fields.date('Creation Date' , readonly=True),
+        'date_closed': fields.date('Close Date', readonly=True),
+        'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
+        'day': fields.char('Day', size=128, readonly=True),
+        'email': fields.integer('# Emails', size=128, readonly=True),
     }
 
     def init(self, cr):
@@ -70,8 +80,11 @@ class crm_helpdesk_report(osv.osv):
             create or replace view crm_helpdesk_report as (
                 select
                     min(c.id) as id,
-                    to_char(c.create_date, 'YYYY') as name,
-                    to_char(c.create_date, 'MM') as month,
+                    to_char(c.date, 'YYYY') as name,
+                    to_char(c.date, 'MM') as month,
+                    to_char(c.date, 'YYYY-MM-DD') as day,
+                    to_char(c.create_date, 'YYYY-MM-DD') as create_date,
+                    to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
                     c.state,
                     c.user_id,
                     c.section_id,
@@ -79,13 +92,19 @@ class crm_helpdesk_report(osv.osv):
                     c.company_id,
                     c.priority,
                     c.date_deadline,
+                    c.categ_id,
+                    c.canal_id,
+                    c.planned_cost,
                     count(*) as nbr,
-                    to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close
+                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    (SELECT count(id) FROM mailgate_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
+                    abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c
-                group by to_char(c.create_date, 'YYYY'), to_char(c.create_date, 'MM'),\
+                group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
                      c.state, c.user_id,c.section_id,c.priority,\
-                      c.partner_id,c.company_id,c.date_deadline
+                     c.partner_id,c.company_id,c.date_deadline,c.create_date,c.date,c.date_closed,\
+                     c.categ_id,c.canal_id,c.planned_cost,c.id
             )""")
 
 crm_helpdesk_report()
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 2544a506fd5..b1d913d1423 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -10,17 +10,22 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                <tree colors="blue:state in ('draft');black:state in ('open','pending');gray:state in ('done','cancel') " string="Helpdesk">
-                    <field name="name" />
-                    <field name="month"/>
-                    <field name="section_id" />
-                    <field name="user_id" />
-                    <field name="company_id"/>
-                    <field name="partner_id" />
+                    <field name="name" invisible="1"/>
+                    <field name="month" invisible="1"/>
+                    <field name="section_id" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="priority" invisible="1"/>
-                    <field name="nbr" string="#Helpdesk" />
+                    <field name="nbr" string="#Helpdesk" sum="#Helpdesk"/>
+                    <field name="email" sum="# Mails"/>
                     <field name="delay_close"/>
+                    <field name="delay_expected"/>
+                    <field name="planned_cost"/>
                     <field name="state" invisible="1"/>
+                    <field name="day" invisible="1"/>
+                    <field name="canal_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -71,13 +76,15 @@
             <field name="arch" type="xml">
                 <search string="Search">
                   <group col="16" colspan="9">
-                   		<filter string="This Year" icon="terp-go-year"
-                   			domain="[('name','=',time.localtime()[0])]"
-                   			default="1" />
-
-                   		<filter string="This Month" icon="terp-go-month"
-                   			domain="[('month','=',time.strftime('%%m'))]"
-                   			default="1" />
+               			<filter string="  Year  " icon="terp-go-year"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                            help="Helpdesk requests created in last 365 days"/>
+                        <filter string="   Month   " icon="terp-go-month" name="this_month"
+                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            help="Helpdesk requests created in last 30 days"/>
+                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Helpdesk requests created in the previous month"/>
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-check"
@@ -89,13 +96,9 @@
                    		<filter string="Lost" icon="terp-dialog-close"
                    			domain="[('state','=','cancel')]" />
 
-                   		<filter string="Deadline" icon="terp-go-month"
-                   			domain="[('date_deadline','=',time.strftime('%%m/%%d/%%Y'))]" />
-
                    		<separator orientation="vertical" />
                    		<field name="section_id"
                    			default="context.get('section_id', False)"
-                   			widget="selection"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
@@ -104,49 +107,59 @@
                    				help="My section" />
 
                    		</field>
-                   		<field name="company_id" widget="selection">
-                           <filter icon="terp-go-home"
+                   		<field name="company_id">
+                        <filter icon="terp-go-home"
                         context="{'invisible_section': False}"
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
-
                         </field>
-                         <field name="user_id" widget="selection"/>
+                         <field name="user_id">
+                         <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                         </field>
                    </group>
                    <newline/>
                   <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal"
+                        <filter string="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
-
-                        <filter string="Company" icon="terp-go-home"
-                            domain="[]"
-                            context="{'group_by':'company_id'}" />
-
-                        <filter string="Section" icon="terp-personal+"
+                        <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-
-                        <separator orientation="vertical" />
-                        <filter string="State" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-
                         <filter string="Partner" icon="terp-personal"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
-
+                            
                         <separator orientation="vertical" />
+                        <filter string="Channel" icon="terp-call-start"
+                            domain="[]"
+                            context="{'group_by':'canal_id'}" />
+                            
+                        <separator orientation="vertical" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize"
+                            domain="[]" context="{'group_by':'state'}" />
+                       
+                        <separator orientation="vertical" />
+                        <filter string="Company" icon="terp-go-home" 
+                            domain="[]"
+                            context="{'group_by':'company_id'}" />
+                            
+                        <separator orientation="vertical" />
+                        <filter string="Day" icon="terp-go-today"
+                            domain="[]" context="{'group_by':'day'}" help="Day of helpdesk requests"/>
                         <filter string="Month" icon="terp-go-month"
-                            domain="[]" context="{'group_by':'month'}" />
-
+                            domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                         <filter string="Year" icon="terp-go-year"
-                            domain="[]" context="{'group_by':'name'}" />
+                            domain="[]" context="{'group_by':'name'}" help="Year of helpdesk requests" />
 
                   </group>
                     <newline/>
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <separator orientation="vertical"/>
+                        <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]"/>
+                        <field name="priority"/>
+                        <newline/>
+                        <field name="date_closed"/>
                    </group>
 
 
@@ -157,10 +170,11 @@
 <!-- Helpdesk report after Sales Services Action -->
 
         <record id="action_report_crm_helpdesk" model="ir.actions.act_window">
-            <field name="name">Helpdesk</field>
+            <field name="name">Helpdesk Analysis</field>
             <field name="res_model">crm.helpdesk.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="view_id" ref="view_report_crm_helpdesk_tree"/>
             <field name="search_view_id" ref="view_report_crm_helpdesk_filter"/>
             <field name="help">Helpdesk allows you to consult different informations relative to support demands. Check for treatments delays, number of responses given and emails send and costs. You can sort out your analysis on different groups to get fine grained analysis.</field>

From ee989c3b7a589b9c3c82d5a78f111bc0dfa305ad Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 10:46:22 +0530
Subject: [PATCH 55/71] [IMP] crm:-converted negative value of 'Overpassed
 Deadline' field of Opportunities Analysis to positive

bzr revid: mtr@mtr-20100923051622-geplxssm3pej1moy
---
 addons/crm/report/crm_lead_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 2f10922a947..fa53a373575 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -156,7 +156,7 @@ class crm_lead_report(osv.osv):
                     (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected,
+                    abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as  delay_expected,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
                 FROM
                     crm_lead c

From e3c4cb38d8aadc9424cc493b61f386607a0200d4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 23 Sep 2010 11:42:32 +0530
Subject: [PATCH 56/71] [FIX] project_issue: fix regression

bzr revid: hmo@tinyerp.com-20100923061232-uvdojykizm32lypw
---
 addons/project_issue/report/project_issue_report.py       | 2 +-
 addons/project_issue/report/project_issue_report_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index bf8085ba932..41ebaa3243e 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -87,7 +87,7 @@ class project_issue_report(osv.osv):
         'company_id' : fields.many2one('res.company', 'Company'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
-        'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
+        'type_id': fields.many2one('crm.case.resource.type', 'Version'),
         'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
         'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
         'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index bb0147cd244..0f4a4a665e7 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -137,7 +137,7 @@
                     		<separator orientation="vertical"/>
                     		<field name="priority" />
                     		<separator orientation="vertical"/>
-                    		<field name="type_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                    		<field name="type_id" widget="selection"/>
                     		<field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
                     		<field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]" />
                     		<separator orientation="vertical"/>

From da79a905ce6df56d17e49e83ddff8a7cee2e51f9 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 23 Sep 2010 13:00:20 +0530
Subject: [PATCH 57/71] [FIX]: crm: Fixed view of resource type

bzr revid: rpa@tinyerp.com-20100923073020-o1i1mjfxic468cs7
---
 addons/crm/crm_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 03551e6fc7b..ec15c161d50 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -186,7 +186,6 @@
                 <form string="Campaign">
                     <field name="name" select="1"/>
                     <field name="section_id" select="1" widget="selection"/>
-                    <field name="object_id"/>
                 </form>
             </field>
         </record>

From eca3479d7d14869a4f872a641c367ef570949c51 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 14:28:15 +0530
Subject: [PATCH 58/71] [IMP] crm_helpdesk:-changed the color in Helpdesk
 Analysis

bzr revid: mtr@mtr-20100923085815-jbo0r43zffhoys2v
---
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index b1d913d1423..bfe6552299e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -9,7 +9,7 @@
             <field name="model">crm.helpdesk.report</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-               <tree colors="blue:state in ('draft');black:state in ('open','pending');gray:state in ('done','cancel') " string="Helpdesk">
+           <tree string="Helpdesk">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>

From 4cf84946522d9683d95cc5c9f0558caa446002e9 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 19:02:48 +0530
Subject: [PATCH 59/71] [IMP] crm and crm*:-useability improvements in
 Reporting

bzr revid: mtr@mtr-20100923133248-vfmxlozaii77fa4l
---
 addons/crm/report/crm_lead_report_view.xml    | 10 +++++-----
 .../crm/report/crm_phonecall_report_view.xml  | 17 +++++++++-------
 .../report/crm_claim_report_view.xml          | 14 ++++++-------
 .../report/crm_fundraising_report_view.xml    | 20 +++++++++----------
 .../report/crm_helpdesk_report_view.xml       | 16 +++++++--------
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0a36ab4e01c..b91f7be89d0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -73,13 +73,13 @@
                     <group col="20" colspan="8">
                         <filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Leads/Opportunities created in last 365 days"/>
+                            help="Leads/Opportunities created in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                            help="Leads/Opportunities created in last 30 days"/>
-                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            help="Leads/Opportunities created in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Leads/Opportunities created in the previous month"/>
+                            help="Leads/Opportunities created in last month"/>
                             
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -101,7 +101,7 @@
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My team" />
                         </field>
-                        <field name="user_id">
+                        <field name="user_id" string="Salesman">
                             <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                         </field>
                    </group>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index f717cc0ca6d..20ad0668fc6 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -76,13 +76,16 @@
                 <search string="Search">
                   <group col="16" colspan="8">
                            <filter string="  Year  " icon="terp-go-year"
-                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"/>
+                               domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                               help="Phone calls made in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
+                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           help="Phone calls made in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"/>
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
+                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Phone calls made in last month"/>
 
                            <separator orientation="vertical" />
                         <filter icon="terp-check"
@@ -95,15 +98,15 @@
                             string="Done"
                             domain="[('state','=','done')]"/>
                       <separator orientation="vertical" />
-                        <field name="section_id"
+                        <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">               
                        <filter icon="terp-personal+"
                            context="{'invisible_section': False}"
                            domain="[('section_id.user_id','=',uid)]"
-                           help="My section" />
+                           help="My team" />
                         </field>   
-                          <field name="user_id" select="1">
+                          <field name="user_id" string="Salesman" select="1">
                             <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index c003105ee8a..cabf4ae1f0f 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -79,15 +79,15 @@
                   <group col="16" colspan="8">
                    		<filter string="  Year  " icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Claims created in last 365 days"/>
+                   			help="Claims created in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                    	   help="Claims created in last 30 days"/>
+                    	   help="Claims created in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Claims created in the previous month"/>
+                            help="Claims created in last month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -101,14 +101,14 @@
                     		domain="[('state','=','pending')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -118,7 +118,7 @@
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1">
+                      	<field name="user_id" string="Salesman" select="1">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 15f06706bed..fb82f4cbc24 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -78,15 +78,15 @@
                   <group col="16" colspan="8">
                    		<filter string="  Year  " icon="terp-go-year"
                    			domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                   			help="Funds raised in last 365 days"/>
+                   			help="Funds raised in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
                     	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                    	   help="Funds raised in last 30 days"/>
+                    	   help="Funds raised in current month"/>
 
-                       <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                       <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Funds raised in the previous month"/>
+                            help="Funds raised in last month"/>
 
                    		<separator orientation="vertical" />
                         <filter icon="terp-document-new"
@@ -100,14 +100,14 @@
                     		domain="[('state','=','pending')]"/>
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -117,7 +117,7 @@
                         help="My company"/>
                         </field>
 
-                      	<field name="user_id" select="1">
+                      	<field name="user_id" select="1" string="Salesman">
 	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
@@ -146,15 +146,15 @@
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
                             domain="[]" context="{'group_by':'day'}"
-                            help="Day on which fund is raised"/>
+                            help="Date of fundraising"/>
 
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" 
-                            help="Month in which fund is raised"/>
+                            help="Month of fundraising"/>
 
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'name'}" 
-                            help="Year in which fund is raised"/>
+                            help="Year of fundraising"/>
 
                   </group>
                    <newline/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index bfe6552299e..836aa1d2020 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -78,13 +78,13 @@
                   <group col="16" colspan="9">
                			<filter string="  Year  " icon="terp-go-year"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                            help="Helpdesk requests created in last 365 days"/>
+                            help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                            help="Helpdesk requests created in last 30 days"/>
-                        <filter icon="terp-go-week" string="    Month-1    " separator="1"
+                            help="Helpdesk requests occurred in current month"/>
+                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
-                            help="Helpdesk requests created in the previous month"/>
+                            help="Helpdesk requests occurred in last month"/>
 
                    		<separator orientation="vertical" />
                    		<filter string="Current" icon="terp-check"
@@ -97,14 +97,14 @@
                    			domain="[('state','=','cancel')]" />
 
                    		<separator orientation="vertical" />
-                   		<field name="section_id"
+                   		<field name="section_id" string="Sales Team"
                    			default="context.get('section_id', False)"
                    			context="{'invisible_section': False}">
 
                    			<filter icon="terp-personal+"
                    				context="{'invisible_section': False}"
                    				domain="[('section_id.user_id','=',uid)]"
-                   				help="My section" />
+                   				help="My team" />
 
                    		</field>
                    		<field name="company_id">
@@ -113,7 +113,7 @@
                         domain="[('section_id.user_id.company_id','=',uid)]"
                         help="My company"/>
                         </field>
-                         <field name="user_id">
+                         <field name="user_id" string="Salesman">
                          <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
                          </field>
                    </group>
@@ -145,7 +145,7 @@
                             
                         <separator orientation="vertical" />
                         <filter string="Day" icon="terp-go-today"
-                            domain="[]" context="{'group_by':'day'}" help="Day of helpdesk requests"/>
+                            domain="[]" context="{'group_by':'day'}" help="Date of helpdesk requests"/>
                         <filter string="Month" icon="terp-go-month"
                             domain="[]" context="{'group_by':'month'}" help="Month of helpdesk requests"/>
                         <filter string="Year" icon="terp-go-year"

From 9442cea321a99d060253d73145b061ae04f48406 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 23 Sep 2010 19:12:09 +0530
Subject: [PATCH 60/71] [IMP,REM]: crm: Removed unused menus for resource type

bzr revid: rpa@tinyerp.com-20100923134209-3rlezmc5pcsqkn37
---
 addons/crm/crm_lead_view.xml                   | 15 ---------------
 addons/crm/crm_phonecall_view.xml              | 13 -------------
 addons/crm/crm_view.xml                        |  4 ++++
 addons/crm_claim/crm_claim_view.xml            | 15 ---------------
 .../crm_fundraising/crm_fundraising_view.xml   | 18 ------------------
 5 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5afad865414..82381731c98 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -31,21 +31,6 @@
         <menuitem action="crm_lead_categ_action"
             id="menu_crm_lead_categ" name="Categories"
             parent="base.menu_crm_config_lead" sequence="1"/>
-        
-        <!--  Resource Type Form View -->
-        <record id="crm_lead_resource_act" model="ir.actions.act_window">
-            <field name="name">Lead Sources</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
-            <field name="context">{'object_id':'crm.lead'}</field>
-        </record>
-
-      <menuitem action="crm_lead_resource_act"
-            id="menu_crm_lead_resource_act" name="Lead Sources"
-            groups="base.group_extended" sequence="2"
-            parent="base.menu_crm_config_lead" />
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 51518040ded..0832c0a16ee 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -16,19 +16,6 @@
     <menuitem action="crm_phonecall_categ_action" name="Categories"
         id="menu_crm_case_phonecall-act" parent="menu_crm_config_phonecall" />
 
-<!-- ResourceType Form View -->
-
-    <record id="crm_phonecall_resource_act" model="ir.actions.act_window">
-            <field name="name">Phonecall Campaigns</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-    </record>
-
-     <menuitem action="crm_phonecall_resource_act"
-        id="menu_crm_phonecall_resource_act" name="Campaigns"
-        parent="menu_crm_config_phonecall" />
-
 <!--  PhoneCalls Tree View -->
 
     <record model="ir.ui.view" id="crm_case_phone_tree_view">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index ec15c161d50..061888d02fb 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -199,6 +199,10 @@
             <field name="view_id" ref="crm_case_resource_type_tree"/>
         </record>
 
+         <menuitem action="crm_case_resource_type_act"
+            id="menu_crm_case_resource_type_act" sequence="4"
+            parent="base.menu_sale_config_sales" />
+
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by Sales Team</field>
             <field name="res_model">crm.case.section</field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 834b284e2ba..a341915bc39 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -35,21 +35,6 @@
          <menuitem action="crm_claim_stage_act" name="Stages"
                 id="menu_crm_claim_stage_act" parent="menu_config_claim" />
 
-        <!-- Claim Resource Type -->
-
-        <record id="crm_claim_resource_act" model="ir.actions.act_window">
-            <field name="name">Claim Resource Type</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.claim')]</field>
-            <field name="context">{'object_id':'crm.claim'}</field>
-        </record>
-
-         <menuitem action="crm_claim_resource_act" name="Resource Type"
-                id="menu_crm_claim_type_act"
-                parent="menu_config_claim" />
-
         <!-- Claims    -->
 
         <record model="ir.ui.view" id="crm_case_claims_tree_view">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 0fb1e34942a..2021245c1f5 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -37,24 +37,6 @@
             id="menu_crm_fundraising_stage_act"
             parent="menu_config_fundrising" />
 
-
-        <!-- Fund Resource Type Form View -->
-
-        <record id="crm_fundraising_resource_act" model="ir.actions.act_window">
-            <field name="name">Fundraising Resource Type</field>
-            <field name="res_model">crm.case.resource.type</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_resource_type_tree"/>
-            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-            <field name="context">{'object_id':'crm.fundraising'}</field>
-        </record>
-
-       <menuitem action="crm_fundraising_resource_act"
-            groups="base.group_extended" name="Resource Type"
-            id="menu_crm_fundraising_resource_act"
-            parent="menu_config_fundrising" />
-
-
         <!-- Fund Raising Tree View -->
 
         <record model="ir.ui.view" id="crm_case_tree_view_fund">

From 85e30424c7c976b612900c263371596ea90e2ac5 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 19:16:20 +0530
Subject: [PATCH 61/71] [IMP] sale and sale_journal:-useability improvements

bzr revid: mtr@mtr-20100923134620-8x3xnn7tjlg1k0fw
---
 addons/sale/report/sale_report_view.xml   | 6 +++---
 addons/sale/sale_view.xml                 | 4 ++--
 addons/sale_journal/sale_journal_view.xml | 8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 46fa68e0eac..f8076b03270 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -53,12 +53,12 @@
                 <group>
                     <filter icon="terp-go-year" string="  Year  "
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
-                        help="Sales order created in last 365 days"/>
+                        help="Sales order created in current year"/>
                     <filter icon="terp-go-month" string="   Month   "
                         name="month"
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                        help="Sales order created in last 30 days"/>
-                    <filter icon="terp-go-week"
+                        help="Sales order created in current month"/>
+                    <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
                          domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d81a127f0ea..b8a8b64e7ce 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -268,12 +268,12 @@
                     </field>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_extended">
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
-                        <separator orientation="vertical"/>
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 966f6307e5e..fd09f362000 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -17,11 +17,9 @@
                     <field name="invoicing_method" select="1"/>
                     <field name="active" select="1"/>
                     </group>
-                     <notebook>
-                        <page string="Notes">
-                            <field name="note" colspan="2" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <separator string="Notes" colspan="3"/>
+                    <newline/>
+                    <field name="note" colspan="3" nolabel="1"/>
                 </form>
             </field>
         </record>

From e6657edd3568f2661717d0dc6e7d225230acd6d4 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Thu, 23 Sep 2010 19:20:47 +0530
Subject: [PATCH 62/71] [REF, IMP]: sale_crm: Code improvement, Removed unused
 code

bzr revid: rpa@tinyerp.com-20100923135047-b55igfq4dg66xjzw
---
 addons/sale_crm/sale_crm.py             |  39 +----
 addons/sale_crm/wizard/crm_make_sale.py | 185 +++++++++++-------------
 2 files changed, 88 insertions(+), 136 deletions(-)

diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index f1828d27b03..9570fe0c6fa 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,47 +23,10 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
+
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
-    def action_cancel(self, cr, uid, ids, context=None):
-        res = super(sale_order, self).action_cancel(cr, uid, ids, context=context)
-        case_pool = self.pool.get('crm.lead')
-        data_pool = self.pool.get('ir.model.data')
-        data = data_pool._get_id(cr, uid, 'crm', 'stage_lead6')
-        res_data = data_pool.read(cr, uid, data, ['res_id'])
-        lost_stage_id = False
-        if res_data and res_data.get('res_id'):
-            lost_stage_id = res_data.get('res_id', False)
-        if not lost_stage_id:
-            return res
-        # After sale cancel, lead also lost
-        for sale_id in ids:
-            lead_ids = case_pool.search(cr, uid, [('ref','=','sale.order,%s'%(sale_id))])
-            case_pool.write(cr, uid, lead_ids, {'stage_id': lost_stage_id})
-        return res
-    def action_ship_create(self, cr, uid, ids, *args):
-        res = super(sale_order, self).action_ship_create(cr, uid, ids, *args)
-        case_pool = self.pool.get('crm.lead')
-        data_pool = self.pool.get('ir.model.data')
-        data = data_pool._get_id(cr, uid, 'crm', 'stage_lead5')
-        res_data = data_pool.read(cr, uid, data, ['res_id'])
-        win_stage_id = False
-        if res_data and res_data.get('res_id'):
-            win_stage_id = res_data.get('res_id', False)
-        if not win_stage_id:
-            return res
-        # After sale confimed, lead also win
-        for sale_id in ids:
-            lead_ids = case_pool.search(cr, uid, [('ref','=','sale.order,%s'%(sale_id))])
-            case_pool.write(cr, uid, lead_ids, {'stage_id': win_stage_id})
-        return res
-    def _get_section(self, cr, uid, context=None):
-       return context.get('context_section_id', False)
-
-    _defaults = {
-          'section_id': _get_section
-    }
 
 sale_order()
 
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6f968b481e1..ed170e7ff6a 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-import time
-
 from osv import fields, osv
 from tools.translate import _
 import decimal_precision as dp
+import time
+
 
 class crm_make_sale(osv.osv_memory):
     """ Make sale  order for crm """
@@ -42,10 +42,12 @@ class crm_make_sale(osv.osv_memory):
         """
         if not context:
             context = {}
+ 
         lead_obj = self.pool.get('crm.lead')
         active_id = context and context.get('active_id', False) or False
         if not active_id:
             return False
+ 
         lead = lead_obj.read(cr, uid, active_id, ['partner_id'])
         return lead['partner_id']
 
@@ -53,14 +55,11 @@ class crm_make_sale(osv.osv_memory):
         if context is None:
             context = {}
         if context.get('active_ids', False) and context['active_ids']:
-            oppr = self.pool.get('crm.lead').browse(cr, uid, context['active_ids'])
-            for line in oppr:
+            for line in self.pool.get('crm.lead').browse(cr, uid, context['active_ids']):
                 if not line.section_id:
                     raise osv.except_osv(_('Warning !'), _(' Sales Team is not specified.'))
         return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
 
-
-
     def makeOrder(self, cr, uid, ids, context=None):
         """
         This function  create Quotation on given case.
@@ -80,75 +79,65 @@ class crm_make_sale(osv.osv_memory):
         partner_obj = self.pool.get('res.partner')
         sale_line_obj = self.pool.get('sale.order.line')
 
-        result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
-
         data = context and context.get('active_ids', []) or []
 
-        for make in self.browse(cr, uid, ids):
-            default_partner_addr = partner_obj.address_get(cr, uid, [make.partner_id.id],
-                    ['invoice', 'delivery', 'contact'])
-            default_pricelist = partner_obj.browse(cr, uid, make.partner_id.id,
-                         context).property_product_pricelist.id
-            fpos_data = partner_obj.browse(cr, uid, make.partner_id.id, context).property_account_position
+        for make in self.browse(cr, uid, ids, context=context):
+            partner = make.partner_id
+            partner_addr = partner_obj.address_get(cr, uid, [partner.id], 
+                    ['default', 'invoice', 'delivery', 'contact'])
+            pricelist = partner.property_product_pricelist.id
+            fpos = partner.property_account_position and partner.property_account_position.id or False
             new_ids = []
 
-            for case in case_obj.browse(cr, uid, data):
-                if case.partner_id and case.partner_id.id:
-                    partner_id = case.partner_id.id
-                    fpos = case.partner_id.property_account_position and case.partner_id.property_account_position.id or False
-                    partner_addr = partner_obj.address_get(cr, uid, [case.partner_id.id],
+            for case in case_obj.browse(cr, uid, data, context=context):
+                if not partner and case.partner_id:
+                    partner = case.partner_id
+                    fpos = partner.property_account_position and partner.property_account_position.id or False
+                    partner_addr = partner_obj.address_get(cr, uid, [partner.id], 
                             ['default', 'invoice', 'delivery', 'contact'])
-                    pricelist = partner_obj.browse(cr, uid, case.partner_id.id,
-                            context).property_product_pricelist.id
-                else:
-                    partner_id = make.partner_id.id
-                    fpos = fpos_data and fpos_data.id or False
-                    partner_addr = default_partner_addr
-                    pricelist = default_pricelist
+                    pricelist = partner.property_product_pricelist.id
 
                 if False in partner_addr.values():
-                    raise osv.except_osv(_('Data Insufficient!'),_('Customer has no addresses defined!'))
+                    raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!'))
 
                 vals = {
-                    'origin': 'Opportunity: %s' % str(case.id),
-                    'section_id': case.section_id and case.section_id.id or False,
-                    'shop_id': make.shop_id.id,
-                    'partner_id': partner_id,
-                    'pricelist_id': pricelist,
-                    'partner_invoice_id': partner_addr['invoice'],
-                    'partner_order_id': partner_addr['contact'],
-                    'partner_shipping_id': partner_addr['delivery'],
-                    'date_order': time.strftime('%Y-%m-%d'),
-                    'fiscal_position': fpos,
+                    'origin': _('Opportunity: %s') % str(case.id), 
+                    'section_id': case.section_id and case.section_id.id or False, 
+                    'shop_id': make.shop_id.id, 
+                    'partner_id': partner.id, 
+                    'pricelist_id': pricelist, 
+                    'partner_invoice_id': partner_addr['invoice'], 
+                    'partner_order_id': partner_addr['contact'], 
+                    'partner_shipping_id': partner_addr['delivery'], 
+                    'date_order': time.strftime('%Y-%m-%d'), 
+                    'fiscal_position': fpos, 
                 }
 
-                if partner_id:
-                    partner = partner_obj.browse(cr, uid, partner_id, context=context)
+                if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
 
                 if make.analytic_account.id:
                     vals['project_id'] = make.analytic_account.id
                 new_id = sale_obj.create(cr, uid, vals)
                 for line in make.sale_order_line:
-                    value = {}
-                    value['order_id'] = new_id
-                    value['name'] = line.name
-                    value['delay'] = line.delay
-                    value['product_id'] =line.product_id and line.product_id.id or False
-                    value['price_unit'] = line.price_unit
-                    value['tax_id'] = line.tax_id and [(6,0,map(lambda x: x.id,line.tax_id))] or False
-                    value['type'] = line.type
-                    value['product_uom_qty']=line.product_uom_qty
-                    value['product_uom']=line.product_uom.id
-                    value['product_uos_qty']=line.product_uos_qty
-                    value['product_uos']=line.product_uos and line.product_uos.id or False
-                    value['product_packaging'] = line.product_packaging and line.product_packaging.id or False
-                    value['discount']=line.discount
-                    value['notes']=line.notes
-                    sale_line_obj.create(cr, uid, value)
-                stage_data = mod_obj._get_id(cr, uid, 'crm', 'stage_lead3')
-                stage_data = mod_obj.read(cr, uid, stage_data, ['res_id'])
-                case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id, 'stage_id': stage_data['res_id']})
+                    value = {
+                            'order_id': new_id, 
+                            'name': line.name, 
+                            'delay': line.delay, 
+                            'product_id': line.product_id and line.product_id.id or False, 
+                            'price_unit': line.price_unit, 
+                            'tax_id': line.tax_id and [(6, 0, map(lambda x: x.id, line.tax_id))] or False, 
+                            'type': line.type, 
+                            'product_uom_qty': line.product_uom_qty, 
+                            'product_uom': line.product_uom.id, 
+                            'product_uos_qty': line.product_uos_qty, 
+                            'product_uos': line.product_uos and line.product_uos.id or False, 
+                            'product_packaging': line.product_packaging and line.product_packaging.id or False, 
+                            'discount': line.discount, 
+                            'notes': line.notes
+                            }
+                    sale_line_obj.create(cr, uid, value, context=context)
+                case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
                 message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Sales Quotation.")
                 self.log(cr, uid, case.id, message)
@@ -160,22 +149,22 @@ class crm_make_sale(osv.osv_memory):
                 return {}
             if len(new_ids)<=1:
                 value = {
-                    'domain': str([('id', 'in', new_ids)]),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'sale.order',
-                    'view_id': False,
-                    'type': 'ir.actions.act_window',
+                    'domain': str([('id', 'in', new_ids)]), 
+                    'view_type': 'form', 
+                    'view_mode': 'form', 
+                    'res_model': 'sale.order', 
+                    'view_id': False, 
+                    'type': 'ir.actions.act_window', 
                     'res_id': new_ids and new_ids[0]
                 }
             else:
                 value = {
-                    'domain': str([('id', 'in', new_ids)]),
-                    'view_type': 'form',
-                    'view_mode': 'tree,form',
-                    'res_model': 'sale.order',
-                    'view_id': False,
-                    'type': 'ir.actions.act_window',
+                    'domain': str([('id', 'in', new_ids)]), 
+                    'view_type': 'form', 
+                    'view_mode': 'tree,form', 
+                    'res_model': 'sale.order', 
+                    'view_id': False, 
+                    'type': 'ir.actions.act_window', 
                     'res_id': new_ids
                 }
             return value
@@ -188,23 +177,23 @@ class crm_make_sale(osv.osv_memory):
         return shop and shop[0] or False
 
     _columns = {
-        'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
-        'partner_id': fields.many2one('res.partner', 'Customer', required=True),
-        'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'),
-        'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'),
-        'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'),
+        'shop_id': fields.many2one('sale.shop', 'Shop', required=True), 
+        'partner_id': fields.many2one('res.partner', 'Customer', required=True), 
+        'sale_order_line': fields.one2many('sale.order.make.line', 'opportunity_order_id', 'Product Line'), 
+        'analytic_account': fields.many2one('account.analytic.account', 'Analytic Account'), 
+        'close': fields.boolean('Close Case', help='Check this to close the case after having created the sale order.'), 
     }
     _defaults = {
-         'shop_id': _get_shop_id,
-         'partner_id': _selectPartner,
+         'shop_id': _get_shop_id, 
+         'partner_id': _selectPartner, 
     }
 
 crm_make_sale()
 
 class sale_order_make_line(osv.osv_memory):
 
-    def product_id_change(self, cr, uid, ids, product, qty=0,
-            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+    def product_id_change(self, cr, uid, ids, product, qty=0, 
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False, 
             lang=False, update_tax=True, packaging=False, flag=False):
         if not  partner_id:
             raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
@@ -217,28 +206,28 @@ class sale_order_make_line(osv.osv_memory):
     _name = 'sale.order.make.line'
     _description = 'Opportunity Sale Order Line'
     _columns = {
-        'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, ),
-        'name': fields.char('Description', size=256, required=True, select=True, ),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
-        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True),
-        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True, ),
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True, ),
-        'product_uos_qty': fields.float('Quantity (UoS)'),
-        'product_uos': fields.many2one('product.uom', 'Product UoS'),
-        'product_packaging': fields.many2one('product.packaging', 'Packaging'),
-        'discount': fields.float('Discount (%)', digits=(16, 2)),
-        'notes': fields.text('Notes'),
+        'opportunity_order_id': fields.many2one('crm.make.sale', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True,), 
+        'name': fields.char('Description', size=256, required=True, select=True,), 
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer"), 
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')), 
+        'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'), 
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True), 
+        'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True,), 
+        'product_uom': fields.many2one('product.uom', 'Unit of Measure ', required=True,), 
+        'product_uos_qty': fields.float('Quantity (UoS)'), 
+        'product_uos': fields.many2one('product.uom', 'Product UoS'), 
+        'product_packaging': fields.many2one('product.packaging', 'Packaging'), 
+        'discount': fields.float('Discount (%)', digits=(16, 2)), 
+        'notes': fields.text('Notes'), 
     }
     _order = 'sequence, id'
     _defaults = {
-        'discount': 0.0,
-        'delay': 0.0,
-        'product_uom_qty': 1,
-        'product_uos_qty': 1,
-        'type': 'make_to_stock',
+        'discount': 0.0, 
+        'delay': 0.0, 
+        'product_uom_qty': 1, 
+        'product_uos_qty': 1, 
+        'type': 'make_to_stock', 
         'product_packaging': False
     }
 

From dbd589dd123daa46ed74fcffb95b9f2265505d4c Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 19:47:31 +0530
Subject: [PATCH 63/71] [IMP] crm:-reverted the useability change in the state
 field of Phonecall

bzr revid: mtr@mtr-20100923141731-1cstzpjimk4t6lbz
---
 addons/crm/crm_phonecall.py               | 6 +++---
 addons/crm/report/crm_phonecall_report.py | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index b9e34d9397c..afa153fb662 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -50,11 +50,11 @@ class crm_phonecall(crm_case, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'), 
         'description': fields.text('Description'), 
         'state': fields.selection([
-                                    ('draft', 'Todo'), 
+                                    ('draft', 'Draft'), 
                                     ('open', 'Todo'), 
                                     ('cancel', 'Cancelled'), 
-                                    ('done', 'Held'), 
-                                    ('pending', 'Not Held'),
+                                    ('done', 'Done'), 
+                                    ('pending', 'Pending'),
                                 ], 'State', size=16, readonly=True, 
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index a82dc15525f..259764e4170 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -24,11 +24,11 @@ import tools
 from crm import crm
 
 AVAILABLE_STATES = [
-    ('draft','Todo'),
-    ('open','Todo'),
+    ('draft','Draft'),
+    ('open','Open'),
     ('cancel', 'Cancelled'),
-    ('done', 'Held'),
-    ('pending','Not Held')
+    ('done', 'Closed'),
+    ('pending','Pending')
 ]
 
 

From 98807e4424cb1c163578eac27c6aad856ed99ff2 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Thu, 23 Sep 2010 20:02:07 +0530
Subject: [PATCH 64/71] [IMP] crm:-rename the 'Current' button to 'Active' in
 lead analysis and added the tooltip

bzr revid: mtr@mtr-20100923143207-3tm8qix8g71kfv4u
---
 addons/crm/report/crm_lead_report_view.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index b91f7be89d0..3826b5e2494 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -83,14 +83,17 @@
                             
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
-                            string="Current"
-                            domain="[('state','in',('draft','open'))]"/>
+                            string="Active"
+                            domain="[('state','in',('draft','open'))]"
+                            help="Leads/Opportunities which are in draft and open state"/>
                         <filter icon="gtk-media-pause"
                             string="Pending"
-                            domain="[('state','=','pending')]"/>
+                            domain="[('state','=','pending')]"
+                            help="Leads/Opportunities which are in pending state"/>
                         <filter icon="terp-dialog-close"
                             string="Closed"
-                            domain="[('state','=','done')]"/>
+                            domain="[('state','=','done')]"
+                            help="Leads/Opportunities which are in done state"/>
                             
                         <separator orientation="vertical" />
                         <field name="section_id"

From fba825f0eb7fc051addd16fd599aa8460feefab6 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 24 Sep 2010 11:13:04 +0530
Subject: [PATCH 65/71] [IMP] project_scrum: rename resposible_id with user_id
 and improve view

bzr revid: hmo@tinyerp.com-20100924054304-1jypvur4awbn85cu
---
 addons/project_scrum/project_scrum.py       |  2 +-
 addons/project_scrum/project_scrum_view.xml | 41 +++++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 08c55837165..e3e48f70b86 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -320,7 +320,7 @@ class project_scrum_meeting(osv.osv):
         'question_blocks': fields.text('Blocks encountered'),
         'question_backlog': fields.text('Backlog Accurate'),
         'task_ids': fields.many2many('project.task', 'meeting_task_rel', 'metting_id', 'task_id', 'Tasks'),
-        'responsible_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Responsible'),
+        'user_id': fields.related('sprint_id', 'scrum_master_id', type='many2one', relation='res.users', string='Responsible', readonly=True),
     }
     #
     # TODO: Find the right sprint thanks to users and date
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 7b33658f065..fcf7cae08f5 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -245,7 +245,39 @@
                             </group>
                         </page>
                         <page string="Daily Meetings">
-                            <field colspan="4" name="meeting_ids" nolabel="1" widget="one2many_list"/>
+                            <field colspan="4" name="meeting_ids" nolabel="1" widget="one2many_list">
+                                <form string="Scrum Sprint">
+                                    <group colspan="4" col="6">
+                                            <field name="date"/>
+                                            <field name="user_id"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Scrum Meeting">
+                                            <separator colspan="4" string="What did you do since the last meeting?"/>
+                                            <field colspan="4" name="question_yesterday" nolabel="1"/>
+                                            <separator colspan="4" string="What do you plan to do till the next meeting?"/>
+                                            <field colspan="4" name="question_today" nolabel="1"/>
+                                            <separator colspan="4" string="Are there anything blocking you?"/>
+                                            <field colspan="4" name="question_blocks" nolabel="1"/>
+                                            <separator colspan="4" string=""/>
+                							<button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
+                                            <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
+                                        </page>
+                                        <page string="Optional Info">
+                                            <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
+                                            <field colspan="4" name="question_backlog" nolabel="1"/>
+                                        </page>
+                                        <page string="Links">
+                                            <separator colspan="4" string="Tasks"/>
+                                            <field colspan="4" name="task_ids" nolabel="1" domain="[('sprint_id','=',sprint_id)]"/>
+                                        </page>
+                                </notebook>
+                            </form>
+                            <tree string="Scrum Meeting">
+                                <field name="date"/>
+                                <field name="user_id"/>
+                            </tree>
+                            </field>
                         </page>
                         <page string="Review">
                             <field colspan="4" name="review" nolabel="1"/>
@@ -319,10 +351,11 @@
             <field name="model">project.scrum.meeting</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Scrum Sprint">
+                <tree string="Scrum Meeting">
                     <field name="date"/>
                     <field name="sprint_id"/>
                     <field name="project_id"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -331,11 +364,11 @@
             <field name="model">project.scrum.meeting</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Scrum Sprint">
+                <form string="Scrum Meeting">
                     <group colspan="4" col="6">
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
-                        <field name="responsible_id"/>
+                        <field name="user_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">

From f0805b52bfff3d50e9fbbc9c1ed3c695f6f191e7 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 24 Sep 2010 12:20:33 +0530
Subject: [PATCH 66/71] [IMP] crm:-renamed button string and added tooltip in
 Phone calls Analysis

bzr revid: mtr@mtr-20100924065033-rorvnw4fq8v4w0zn
---
 addons/crm/report/crm_phonecall_report_view.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 20ad0668fc6..01e4c6283f7 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -89,14 +89,17 @@
 
                            <separator orientation="vertical" />
                         <filter icon="terp-check"
-                            string="To Do"
-                            domain="[('state','in',('draft','open'))]"/>
+                            string="Todo"
+                            domain="[('state','in',('draft','open'))]"
+                            help="Phone calls which are in draft and open state"/>
                         <filter icon="gtk-media-pause"
-                            string="Pending"
-                            domain="[('state','=','pending')]"/>
-                        <filter icon="terp-dialog-close"
-                            string="Done"
-                            domain="[('state','=','done')]"/>
+                            string="Not Held"
+                            domain="[('state','=','pending')]"
+                            help="Phone calls which are in pending state"/>
+                        <filter icon="terp-camera_test"
+                            string="Held"
+                            domain="[('state','=','done')]"
+                            help="Phone calls which are in closed state"/>
                       <separator orientation="vertical" />
                         <field name="section_id" string="Sales Team"
                             default="context.get('section_id', False)"

From 6c98b87e5ad7e535a146b26bd01ab54a4596005e Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Fri, 24 Sep 2010 12:34:54 +0530
Subject: [PATCH 67/71] [IMP] crm:-removed 'Stage' button and field from Phone
 calls Analysis

bzr revid: mtr@mtr-20100924070454-fmbcqplkdno88zu5
---
 addons/crm/report/crm_phonecall_report_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 01e4c6283f7..33d630e471b 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -124,7 +124,6 @@
                             context="{'group_by':'section_id'}" />
                         
                         <separator orientation="vertical" />
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection"
                             domain="[]" context="{'group_by':'categ_id'}" />
@@ -148,7 +147,6 @@
                    <group  expand="0" string="Extended Filters..."  groups="base.group_extended">
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field string="Type" name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>

From fb383d75e475900d105a853f00063438e9d5be02 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 24 Sep 2010 14:56:14 +0530
Subject: [PATCH 68/71] [REF] project_long_term: Refactor code to compute tasks
 and phases

bzr revid: hmo@tinyerp.com-20100924092614-kxmx5r8cox7hg4ry
---
 addons/project_long_term/project_long_term.py | 308 ++++++-
 .../project_long_term_demo.xml                | 822 +++++-------------
 .../test/schedule_phase_tasks.yml             |  57 +-
 .../test/schedule_project_phases.yml          |  16 +-
 .../test/schedule_project_tasks.yml           |  68 +-
 addons/project_long_term/wizard/__init__.py   |   1 -
 .../wizard/project_compute_phases.py          | 120 +--
 .../wizard/project_compute_tasks.py           | 120 +--
 .../wizard/project_schedule_tasks.py          | 127 +--
 .../wizard/working_calendar.py                |  98 ---
 addons/resource/resource.py                   | 132 ++-
 11 files changed, 737 insertions(+), 1132 deletions(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index b795dda557e..05eca01887c 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -21,9 +21,10 @@
 
 import time
 from datetime import date, datetime, timedelta
-
 from tools.translate import _
 from osv import fields, osv
+from resource.faces import task as Task
+import operator
 
 class project_phase(osv.osv):
     _name = "project.phase"
@@ -181,38 +182,48 @@ class project_phase(osv.osv):
         uom_obj = self.pool.get('product.uom')
         if context is None:
             context = {}
+        res = super(project_phase, self).write(cr, uid, ids, vals, context=context)
         if context.get('scheduler',False):
-            return super(project_phase, self).write(cr, uid, ids, vals, context=context)
+            return res
         # Consider calendar and efficiency if the phase is performed by a resource
         # otherwise consider the project's working calendar
+
+        #TOCHECK : why need this ?
         if isinstance(ids, (int, long)):
             ids = [ids]
-        phase = self.browse(cr, uid, ids[0], context=context)
-        calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-        resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
-        if resource_id:
+        default_uom_id = self._get_default_uom_id(cr, uid)
+        for phase in self.browse(cr, uid, ids, context=context):
+            calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
+            resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
+            if resource_id:
                 cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
                 if cal_id:
                     calendar_id = cal_id
-        default_uom_id = self._get_default_uom_id(cr, uid)
-        avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-        # Change the date_start and date_end
-        # for previous and next phases respectively based on valid condition
-        if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
+        
+            avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
+            # Change the date_start and date_end
+            # for previous and next phases respectively based on valid condition
+            if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
                 dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
                 if work_times:
                     vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
                 for prv_phase in phase.previous_phase_ids:
+                    if prv_phase.id == phase.id:
+                        continue
                     self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-        if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
+                        
+            if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
                 dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
                 if work_times:
                     vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
                 for next_phase in phase.next_phase_ids:
+                    if next_phase.id == phase.id:
+                        continue
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-        return super(project_phase, self).write(cr, uid, ids, vals, context=context)
+                    
+        return res
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
@@ -241,6 +252,118 @@ class project_phase(osv.osv):
         self.write(cr, uid, ids, {'state': 'done'})
         return True
 
+    def generate_resources(self, cr, uid, ids, context=None):
+        """
+        Return a list of  Resource Class objects for the resources allocated to the phase.
+        """
+        res = {}
+        if context is None:
+            context = {}
+        resource_pool = self.pool.get('resource.resource')
+        for phase in self.browse(cr, uid, ids, context=context):
+            user_ids = map(lambda x:x.resource_id.user_id.id, phase.resource_ids)
+            project = phase.project_id
+            calendar_id  = project.resource_calendar_id and project.resource_calendar_id.id or False
+            resource_objs = resource_pool.generate_resources(cr, uid, user_ids, calendar_id, context=context)
+            res[phase.id] = resource_objs
+        return res
+
+    def generate_schedule(self, cr, uid, ids, start_date, calendar_id=False, context=None):
+        """
+        Schedule phase with the start date till all the next phases are completed.
+        @param: start_dsate : start date for the phase
+        @param: calendar_id : working calendar of the project
+        """ 
+        if context is None:
+            context = {}
+        resource_pool = self.pool.get('resource.resource')
+        uom_pool = self.pool.get('product.uom')
+        phase_resource = False
+        if context is None:
+           context = {}
+        default_uom_id = self._get_default_uom_id(cr, uid)
+        for phase in self.browse(cr, uid, ids, context=context):
+            if not phase.responsible_id:
+                raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
+            
+            phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
+            avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
+            duration = str(avg_hours) + 'H'
+            # Create a new project for each phase
+            def Project():
+                start = start_date
+                minimum_time_unit = 1
+                resource = phase_resource_obj
+                # If project has working calendar then that
+                # else the default one would be considered
+                if calendar_id:
+                    working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+                    vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
+
+                def phase():
+                    effort = duration
+
+            project = Task.BalancedProject(Project)
+            s_date = project.phase.start.to_datetime()
+            e_date = project.phase.end.to_datetime()
+            # Recalculate date_start and date_end
+            # according to constraints on date start and date end on phase
+            if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
+                start_date = datetime.strptime(phase.constraint_date_start, '%Y-%m-%d')
+            else:
+                start_date = s_date
+            if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
+                end_date= datetime.strptime(phase.constraint_date_end, '%Y-%m-%d')
+                date_start = phase.constraint_date_end
+            else:
+                end_date = e_date
+                date_start = end_date
+            # Write the calculated dates back
+            ctx = context.copy()
+            ctx.update({'scheduler': True})
+            self.write(cr, uid, [phase.id], {
+                                          'date_start': start_date.strftime('%Y-%m-%d'),
+                                          'date_end': end_date.strftime('%Y-%m-%d')
+                                        }, context=ctx)
+
+            # Recursive call till all the next phases scheduled
+            for phase in phase.next_phase_ids:
+               if phase.state in ['draft', 'open', 'pending']:
+                   id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
+                   self.generate_schedule(cr, uid, [phase.id], date_start, id_cal, context=context)
+               else:
+                   continue
+        return True
+
+    def schedule_tasks(self, cr, uid, ids, context=None):
+        """
+        Schedule the tasks according to resource available and priority.
+        """
+        task_pool = self.pool.get('project.task')
+        resource_pool = self.pool.get('resource.resource')
+        if context is None:
+            context = {}
+        resources_list = self.generate_resources(cr, uid, ids, context=context)
+        return_msg = {}
+        for phase in self.browse(cr, uid, ids, context=context):
+            start_date = phase.date_start
+            if not start_date and phase.project_id.date_start:
+                start_date = phase.project_id.date_start
+            if not start_date:
+                start_date = datetime.now().strftime("%Y-%m-%d")                    
+            resources = resources_list.get(phase.id, [])
+            calendar_id = phase.project_id.resource_calendar_id.id
+            task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
+            if task_ids:
+                task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
+
+            if not task_ids:
+                warning_msg = _("No tasks to compute for Phase '%s'.") % (phase.name)
+                if "warning" not in return_msg:
+                    return_msg["warning"] =  warning_msg
+                else:
+                    return_msg["warning"] = return_msg["warning"] + "\n" + warning_msg
+        return return_msg
 project_phase()
 
 class project_resource_allocation(osv.osv):
@@ -266,14 +389,169 @@ class project(osv.osv):
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
     }
+    def generate_members(self, cr, uid, ids, context=None):
+        """
+        Return a list of  Resource Class objects for the resources allocated to the phase.
+        """
+        res = {}
+        resource_pool = self.pool.get('resource.resource')
+        if context is None:
+            context = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            user_ids = map(lambda x:x.id, project.members)
+            calendar_id  = project.resource_calendar_id and project.resource_calendar_id.id or False
+            resource_objs = resource_pool.generate_resources(cr, uid, user_ids, calendar_id, context=context)
+            res[project.id] = resource_objs
+        return res
+
+    def schedule_phases(self, cr, uid, ids, context=None):
+        """
+        Schedule the phases.
+        """
+        if context is None:
+            context = {}
+        if type(ids) in (long, int,):
+            ids = [ids]
+        phase_pool = self.pool.get('project.phase')
+        for project in self.browse(cr, uid, ids, context=context):
+            phase_ids = phase_pool.search(cr, uid, [('project_id', '=', project.id),
+                                                  ('state', 'in', ['draft', 'open', 'pending']),
+                                                  ('previous_phase_ids', '=', False)
+                                                  ])
+            start_date = project.date_start
+            if not start_date:
+                start_date = datetime.now().strftime("%Y-%m-%d")
+            start_dt = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
+            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
+            phase_pool.generate_schedule(cr, uid, phase_ids, start_dt, calendar_id, context=context)
+        return True
+
+    def schedule_tasks(self, cr, uid, ids, context=None):
+        """
+        Schedule the tasks according to resource available and priority.
+        """
+        if type(ids) in (long, int,):
+            ids = [ids]
+        user_pool = self.pool.get('res.users')
+        task_pool = self.pool.get('project.task')
+        resource_pool = self.pool.get('resource.resource')
+        if context is None:
+            context = {}
+        
+        resources_list = self.generate_members(cr, uid, ids, context=context)
+        return_msg = {}
+        for project in self.browse(cr, uid, ids, context=context):
+            start_date = project.date_start
+            if not start_date:
+                start_date = datetime.now().strftime("%Y-%m-%d")                    
+            resources = resources_list.get(project.id, [])
+            calendar_id = project.resource_calendar_id.id
+            task_ids = task_pool.search(cr, uid, [('project_id', '=', project.id),
+                                              ('state', 'in', ['draft', 'open', 'pending'])
+                                              ])
+            
+
+            if task_ids:
+                task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
+            else:
+                warning_msg = _("No tasks to compute for Project '%s'.") % (project.name)
+                if "warning" not in return_msg:
+                    return_msg["warning"] =  warning_msg
+                else:
+                    return_msg["warning"] = return_msg["warning"] + "\n" + warning_msg
+
+        return return_msg    
 
 project()
 
-class task(osv.osv):
+class resource_resource(osv.osv):
+    _inherit = "resource.resource"
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context.get('project_id',False):
+            project_pool = self.pool.get('project.project')
+            project_rec = project_pool.browse(cr, uid, context['project_id'])
+            user_ids = [user_id.id for user_id in project_rec.members]
+            args.append(('user_id','in',user_ids))
+        return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
+
+resource_resource()
+
+class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
     }
+    
+    def generate_schedule(self, cr, uid, ids, resources, calendar_id, start_date, context=None):
+        """
+        Schedule the tasks according to resource available and priority.
+        """
+        if not ids:
+            return False
+        if context is None:
+            context = {}
+        user_pool = self.pool.get('res.users')
+        project_pool = self.pool.get('project.project')
+        priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300, '4': 100}
+        # Create dynamic no of tasks with the resource specified
+        def create_tasks(task_number, eff, priorty=500, obj=False):
+            def task():
+                """
+                task is a dynamic method!
+                """
+                effort = eff
+                if obj:
+                    resource = obj
+                priority = priorty
+            task.__doc__ = "TaskNO%d" %task_number
+            task.__name__ = "task%d" %task_number
+            return task
 
-task()
+        # Create a 'Faces' project with all the tasks and resources
+        def Project():
+            title = "Project"
+            start = datetime.strftime(datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M")
+            resource = reduce(operator.or_, resources)
+            minimum_time_unit = 1
+            if calendar_id:            # If project has working calendar
+                working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+                vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
+            # Dynamic creation of tasks
+            task_number = 0
+            for openobect_task in self.browse(cr, uid, ids, context=context):
+                hours = str(openobect_task.planned_hours )+ 'H'
+                if openobect_task.priority in priority_dict.keys():
+                    priorty = priority_dict[openobect_task.priority]
+                real_resource = False
+                if openobect_task.user_id:
+                    for task_resource in resources:
+                        if task_resource.__name__ == task_resource:
+                            real_resource = task_resource
+                            break
+                
+                task = create_tasks(task_number, hours, priorty, real_resource)
+                task_number += 1
+        
+
+        face_projects = Task.BalancedProject(Project)
+        loop_no = 0
+        # Write back the computed dates
+        for face_project in face_projects:
+            s_date = face_project.start.to_datetime()
+            e_date = face_project.end.to_datetime()
+            if loop_no > 0:
+                ctx = context.copy()
+                ctx.update({'scheduler': True})
+                user_id = user_pool.search(cr, uid, [('name', '=', face_project.booked_resource[0].__name__)])
+                self.write(cr, uid, [ids[loop_no-1]], {
+                                                    'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
+                                                    'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
+                                                    'user_id': user_id[0]
+                                                }, context=ctx)
+
+            loop_no += 1
+        return True
+project_task()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 7718048dc05..30acac99377 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,741 +1,393 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-    <!-- Users  -->
-
-        <record id="res_users_demouser1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="address_id" ref="base.main_address"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">Demo User1</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="signature">Mr Demo</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Setup')]"/>
-            <field name="login">demo1</field>
-            <field name="password">demo1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_manager0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">Manager1</field>
+<!-- 
+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 eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">manager1</field>
-            <field name="password">manager1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
+            <field name="login">phu</field>
+            <field name="password">phu</field>
         </record>
-
-        <record id="res_users_manager1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">Manager2</field>
+        <record id="res_users_project_manager" model="res.users">
+            <field name="name">Anthony</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">manager2</field>
-            <field name="password">manager2</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
+            <field name="login">al</field>
+            <field name="password">al</field>
         </record>
-
-        <record id="res_users_user0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user1</field>
+        <record id="res_users_technical_leader" model="res.users">
+            <field name="name">Qwintin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user1</field>
-            <field name="password">USER1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
+            <field name="login">qdp</field>
+            <field name="password">qdp</field>
         </record>
-
-        <record id="res_users_user1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user2</field>
+        <record id="res_users_developer" model="res.users">
+            <field name="name">Francois</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user2</field>
-            <field name="password">user2</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
+            <field name="login">fpi</field>
+            <field name="password">fpi</field>
         </record>
-
-        <record id="res_users_userfinance0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_finance</field>
+        <record id="res_users_designer" model="res.users">
+            <field name="name">Julien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">jth</field>
+            <field name="password">jth</field>
+        </record>
+        <record id="res_users_tester" model="res.users">
+            <field name="name">Alien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">apr</field>
+            <field name="password">apr</field>
+        </record>
+        <record id="res_users_finacial_manager" model="res.users">
+            <field name="name">Fabian</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_finance</field>
-            <field name="password">user_finance</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
+            <field name="login">fbs</field>
+            <field name="password">fbs</field>
         </record>
 
-        <record id="res_users_userdesign0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_design1</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_design1</field>
-            <field name="password">user_design1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_userdesign1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_design2</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_design2</field>
-            <field name="password">user_design2</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_userdeveloper0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_developer1</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_developer1</field>
-            <field name="password">user_developer1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_userdeveloper1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_developer2</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_developer2</field>
-            <field name="password">user_developer1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_usertester0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_tester1</field>
-            <field eval="[(6,0,[ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_tester1</field>
-            <field name="password">user_tester1</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_usertester1" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_tester2</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_tester2</field>
-            <field name="password">user_tester2</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <record id="res_users_useranalyst0" model="res.users">
-            <field model="ir.actions.actions" name="menu_id" search="[('name', '=', u'Menu')]"/>
-            <field name="context_lang">en_US</field>
-            <field name="name">user_analyst</field>
-            <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="[(6, 0, [])]" name="roles_id"/>
-            <field eval="[(6, 0, [])]" name="rules_id"/>
-            <field eval="1" name="active"/>
-            <field model="ir.actions.actions" name="action_id" search="[('name', '=', u'Menu')]"/>
-            <field name="login">user_analyst</field>
-            <field name="password">user_analyst</field>
-            <field eval="[(6, 0, [])]" name="company_ids"/>
-        </record>
-
-        <!-- Resources -->
-
-        <record id="resource_resource_analyst0" model="resource.resource">
-            <field eval="1.0" name="time_efficiency"/>
-            <field name="user_id" ref="res_users_useranalyst0"/>
+        <!-- Human Resources -->
+        <record id="resource_analyst" model="resource.resource">
+            <field name="user_id" ref="res_users_analyst"/>
             <field name="name">Analyst</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="1" name="active"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="resource_type">user</field>
         </record>
 
-        <record id="resource_resource_programmer0" model="resource.resource">
-            <field eval="1.0" name="time_efficiency"/>
-            <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="name">Programmer</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="1" name="active"/>
+        <record id="resource_project_manager" model="resource.resource">
+            <field name="user_id" ref="res_users_project_manager"/>
+            <field name="name">Project Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="resource_type">user</field>
         </record>
 
-        <record id="resource_resource_tester0" model="resource.resource">
-            <field eval="1.0" name="time_efficiency"/>
-            <field name="user_id" ref="res_users_usertester0"/>
+         <record id="resource_technical_leader" model="resource.resource">
+            <field name="user_id" ref="res_users_technical_leader"/>
+            <field name="name">Technical Leader</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+        </record>
+
+        <record id="resource_developer" model="resource.resource">
+            <field name="user_id" ref="res_users_developer"/>
+            <field name="name">Developer</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+        </record>
+
+        <record id="resource_designer" model="resource.resource">
+            <field name="user_id" ref="res_users_designer"/>
+            <field name="name">Designer</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+        </record>
+
+        <record id="resource_tester" model="resource.resource">
+            <field name="user_id" ref="res_users_tester"/>
             <field name="name">Tester</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="1" name="active"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="resource_type">user</field>
         </record>
 
-        <record id="resource_resource_webdesigner0" model="resource.resource">
-            <field eval="1.0" name="time_efficiency"/>
-            <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="name">Web Designer</field>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="1" name="active"/>
+        <record id="resource_finacial_manager" model="resource.resource">
+            <field name="user_id" ref="res_users_finacial_manager"/>
+            <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="resource_type">user</field>
         </record>
+        
+        
 
         <!-- Projects -->
-        <record id="project_project_openerpwebsitedevelopment0" model="project.project">
-            <field eval="10" name="sequence"/>
-            <field name="company_currency_id" ref="base.EUR"/>
-            <field eval="1" name="active"/>
-            <field eval="1" name="warn_manager"/>
-            <field eval="0" name="warn_customer"/>
-            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="1" name="priority"/>
+        <record id="project_integrate_openerp" model="project.project">
+            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
             <field name="state">open</field>
             <field name="type">normal</field>
-            <field name="description">Develop an OpenERP Website.</field>
-            <field eval="[(6, 0, [ref('res_users_manager0'), ref('res_users_user0'), ref('res_users_userfinance0'), ref('res_users_userdesign0'), ref('res_users_userdeveloper0'), ref('res_users_usertester0'), ref('res_users_useranalyst0')])]" name="members"/>
-            <field name="date" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="currency_id" ref="base.EUR"/>
-            <field eval="[(6, 0, [])]" name="type_ids"/>
-            <field name="name">OpenERP Website Development</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_finacial_manager')])]" name="members"/>
+            <field name="user_id" ref="res_users_project_manager"/>
+            <field name="name">Integrate an Sale and Warehouse Management.</field>
         </record>
 
         <!-- Project Phases -->
-        <record id="project_phase_informationgatheringandunderstanding0" model="project.phase">
+        <record id="project_phase_1" model="project.phase">
             <field eval="[(6, 0, [])]" name="previous_phase_ids"/>
-            <field name="name">Information Gathering and Understanding</field>
+            <field name="name">Collect Requirement and Make SRS</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d')"/>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_demouser1"/>
-            <field eval="15.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(2-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_end" eval="(DateTime.now()+timedelta(15-70)).strftime('%Y-%m-%d')"/>
+            <field eval="1" name="sequence"/>
+            <field name="duration">30</field>
+            <field name="responsible_id" ref="res_users_analyst"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
         </record>
 
-        <record id="project_phase_planning0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_informationgatheringandunderstanding0')])]" name="previous_phase_ids"/>
-            <field name="name">Planning</field>
+        <record id="project_phase_2" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_1')])]" name="previous_phase_ids"/>
+            <field name="name">Design Model</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(28-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d')"/>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_manager0"/>
-            <field eval="15.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(13-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_end" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d')"/>
+            <field eval="2" name="sequence"/>
+            <field name="duration">20</field>
+            <field name="responsible_id" ref="res_users_project_manager"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
         </record>
 
-        <record id="project_phase_webdesign0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_planning0')])]" name="previous_phase_ids"/>
-            <field name="name">Web Design </field>
+        <record id="project_phase_3" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
+            <field name="name">Planning and compute Risk analysis, Time chart </field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d')"/>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_userdesign0"/>
-            <field eval="20.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_end" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d')"/>
+            <field eval="3" name="sequence"/>
+            <field name="duration">20</field>
+            <field name="responsible_id" ref="res_users_project_manager"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
         </record>
 
-        <record id="project_phase_developmentintegrationandtesting0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_webdesign0')])]" name="previous_phase_ids"/>
-            <field name="name">Development, Integration and Testing</field>
+        <record id="project_phase_4" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_2')])]" name="previous_phase_ids"/>
+            <field name="name">Development and Integration</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(57-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d')"/>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_manager0"/>
-            <field eval="22.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(35-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_end" eval="(DateTime.now()+timedelta(52-70)).strftime('%Y-%m-%d')"/>
+            <field eval="4" name="sequence"/>
+            <field name="duration">90</field>
+            <field name="responsible_id" ref="res_users_technical_leader"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
         </record>
 
-        <record id="project_phase_websitedeployment0" model="project.phase">
-            <field eval="[(6, 0, [ref('project_phase_developmentintegrationandtesting0')])]" name="previous_phase_ids"/>
-            <field name="name">Website Deployment</field>
+        <record id="project_phase_5" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_4')])]" name="previous_phase_ids"/>
+            <field name="name">Review and Testing</field>
             <field name="product_uom" ref="product.uom_day"/>
-            <field eval="10" name="sequence"/>
-            <field name="constraint_date_end" eval="(DateTime.now()+timedelta(63-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_start" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d')"/>
-            <field name="state">draft</field>
-            <field name="responsible_id" ref="res_users_manager0"/>
-            <field eval="5.0" name="duration"/>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field name="constraint_date_start" eval="(DateTime.now()+timedelta(58-70)).strftime('%Y-%m-%d')"/>
-            <field name="date_end" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d')"/>
+            <field eval="5" name="sequence"/>
+            <field name="duration">30</field>
+            <field name="responsible_id" ref="res_users_project_manager"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+        </record>
+
+        <record id="project_phase_6" model="project.phase">
+            <field eval="[(6, 0, [ref('project_phase_5')])]" name="previous_phase_ids"/>
+            <field name="name">Deployement and Training</field>
+            <field name="product_uom" ref="product.uom_day"/>
+            <field eval="5" name="sequence"/>
+            <field name="duration">10</field>
+            <field name="responsible_id" ref="res_users_analyst"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
         </record>
 
         <!--  Project Resource Allocation -->
-        <record id="project_resource_allocation_0" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_analyst0"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
-            <field eval="40.0" name="useability"/>
+        <record id="resource_allocation_1" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_analyst"/>
+            <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_resource_allocation_1" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_programmer0"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
-            <field eval="60.0" name="useability"/>
+        <record id="resource_allocation_2" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_project_manager"/>
+            <field name="phase_id" ref="project_phase_2"/>
         </record>
 
-        <record id="project_resource_allocation_2" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_tester0"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
-            <field eval="40.0" name="useability"/>
+        <record id="resource_allocation_3" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_project_manager"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_resource_allocation_3" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_analyst0"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
-            <field eval="70.0" name="useability"/>
+        <record id="resource_allocation_4" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_technical_leader"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_resource_allocation_4" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_programmer0"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
-            <field eval="70.0" name="useability"/>
+        <record id="resource_allocation_5" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_developer"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_resource_allocation_5" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_webdesigner0"/>
-            <field name="phase_id" ref="project_phase_webdesign0"/>
-            <field eval="80.0" name="useability"/>
+        <record id="resource_allocation_6" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_designer"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_resource_allocation_6" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_programmer0"/>
-            <field name="phase_id" ref="project_phase_webdesign0"/>
-            <field eval="30.0" name="useability"/>
+        <record id="resource_allocation_7" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_tester"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_resource_allocation_7" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_programmer0"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-            <field eval="100.0" name="useability"/>
+        <record id="resource_allocation_8" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_project_manager"/>
+            <field name="phase_id" ref="project_phase_5"/>
         </record>
-
-        <record id="project_resource_allocation_8" model="project.resource.allocation">
-            <field name="resource_id" ref="resource_resource_tester0"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
-            <field eval="50.0" name="useability"/>
+        
+        <record id="resource_allocation_9" model="project.resource.allocation">
+            <field name="resource_id" ref="resource_analyst"/>
+            <field name="phase_id" ref="project_phase_6"/>
         </record>
 
         <!-- Tasks -->
-        <record id="project_task_preparerequirementsdocument0" model="project.task">
-            <field eval="15" name="sequence"/>
+
+        <record id="project_task_1" model="project.task">
             <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_user0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_analyst"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Prepare Requirements Document</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="100.0" name="total_hours"/>
-            <field eval="100.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
+            <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_definewebsitegoalspurposesandtargetaudience0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_2" model="project.task">
             <field eval="80.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_useranalyst0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()-timedelta(70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_analyst"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Define Website Goals, Purposes and Target Audience</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="80.0" name="total_hours"/>
-            <field eval="80.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Make SRS</field>
+            <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_usecases0" model="project.task">
-            <field eval="17" name="sequence"/>
+        <record id="project_task_3" model="project.task">
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(48-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Use Cases</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="40.0" name="total_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_informationgatheringandunderstanding0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Design Use Cases</field>
+            <field name="phase_id" ref="project_phase_2"/>
         </record>
 
-        <record id="project_task_budgetplanning0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_4" model="project.task">
             <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userfinance0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Budget Planning</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="25.0" name="total_hours"/>
-            <field eval="25.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_qualityplanning0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_5" model="project.task">
             <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_user0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(10-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Quality Planning</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(18-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="25.0" name="total_hours"/>
-            <field eval="25.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_riskmanagementplanning0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_6" model="project.task">
             <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_user1"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(13-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Risk Management Planning</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="20.0" name="total_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_createprojectschedules0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_7" model="project.task">
             <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_manager0"/>
-			<field name="state">open</field>            
-            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Create Project Schedules</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(25-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="30.0" name="total_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_planning0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_dataflowdesign0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_8" model="project.task">
             <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_manager0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(20-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Dataflow Design</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(23-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="10.0" name="total_hours"/>
-            <field eval="10.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_webdesign0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_userinterfacedesign0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_9" model="project.task">
             <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(22-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_project_manager"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">User Interface Design</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="150.0" name="total_hours"/>
-            <field eval="150.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_webdesign0"/>
+            <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_tasklevelwbs0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_10" model="project.task">
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdesign0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_developer"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Task Level WBS</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="40.0" name="total_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_webdesign0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Develop Module in Sale Management</field>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_modularprogramming0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_11" model="project.task">
             <field eval="90.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(30-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_developer"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Modular Programming</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(50-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="90.0" name="total_hours"/>
-            <field eval="90.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Develop module in Warehouse</field>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_integratemodules0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_12" model="project.task">
             <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper1"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_developer"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Integrate Modules</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(53-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="20.0" name="total_hours"/>
-            <field eval="20.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_unittesting0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_13" model="project.task">
             <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_usertester0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_tester"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Unit Testing</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="50.0" name="total_hours"/>
-            <field eval="50.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_regressiontest0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_14" model="project.task">
             <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_usertester0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_tester"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Regression Test</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="30.0" name="total_hours"/>
-            <field eval="30.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_documentation0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_15" model="project.task">
             <field eval="15.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_demouser1"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(40-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_developer"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Documentation</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="15.0" name="total_hours"/>
-            <field eval="15.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_websitedeployment0"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_performancetuning0" model="project.task">
+        <record id="project_task_16" model="project.task">
             <field eval="10" name="sequence"/>
             <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_usertester1"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(45-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_tester"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
             <field name="name">Performance Tuning</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="40.0" name="total_hours"/>
-            <field eval="40.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_developmentintegrationandtesting0"/>
+            <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_deploywebsite0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_17" model="project.task">
             <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_userdeveloper0"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(55-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_analyst"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Deploy Website</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(60-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="5.0" name="total_hours"/>
-            <field eval="5.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_websitedeployment0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Deploy and Review on Customer System</field>
+            <field name="phase_id" ref="project_phase_6"/>
         </record>
 
-        <record id="project_task_presentation0" model="project.task">
-            <field eval="10" name="sequence"/>
+        <record id="project_task_18" model="project.task">
             <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_demouser1"/>
-            <field name="state">open</field>
-            <field name="date_start" eval="(DateTime.now()+timedelta(58-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="company_id" ref="base.main_company"/>
+            <field name="user_id" ref="res_users_analyst"/>
             <field name="priority">2</field>
-            <field name="project_id" ref="project_project_openerpwebsitedevelopment0"/>
-            <field eval="[(6, 0, [])]" name="child_ids"/>
-            <field eval="[(6, 0, [])]" name="parent_ids"/>
-            <field eval="1" name="active"/>
-            <field name="name">Presentation</field>
-            <field name="date_deadline" eval="(DateTime.now()+timedelta(65-70)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field eval="10.0" name="total_hours"/>
-            <field eval="10.0" name="remaining_hours"/>
-            <field name="phase_id" ref="project_phase_websitedeployment0"/>
+            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="name">Training and Presentation</field>
+            <field name="phase_id" ref="project_phase_6"/>
         </record>
 
+        <!-- run scheduling of phase -->
+        <function model="project.project" name="schedule_phases" eval="(ref('project_integrate_openerp'),)"/>
+        <!-- run scheduling of tasks -->
+        <function model="project.project" name="schedule_tasks" eval="(ref('project_integrate_openerp'),)"/>
+
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
index 323d9cbc8f2..150d80af822 100644
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ b/addons/project_long_term/test/schedule_phase_tasks.yml
@@ -2,32 +2,31 @@
   Create project 'Develop an outlook-openerp synchronization plugin'
 - 
   !record {model: project.project, id: project_project_project0}:
-    company_id: base.main_company
-    name: Project123
+    name: Develop an outlook-openerp synchronization plugin
     members:
-      - project_long_term.res_users_manager0
-      - project_long_term.res_users_user0
-      - project_long_term.res_users_userfinance0
-      - project_long_term.res_users_userdesign0
-      - project_long_term.res_users_userdeveloper0
-      - project_long_term.res_users_usertester0
-      - project_long_term.res_users_useranalyst0
+      - project_long_term.res_users_project_manager
+      - project_long_term.res_users_technical_leader
+      - project_long_term.res_users_developer
+      - project_long_term.res_users_designer
+      - project_long_term.res_users_tester
+      - project_long_term.res_users_analyst
+      - project_long_term.res_users_finacial_manager
 - 
   Create phase 'Develop GUI' in Outlook
 - 
   !record {model: project.phase, id: project_phase_phase0}:
     date_start: '2010-06-02'
     duration: 200.0
-    name: phase123
+    name: Develop GUI in Outlook
     product_uom: product.uom_day
     project_id: project_project_project0
     state: draft
     resource_ids:
-      - resource_id: project_long_term.resource_resource_analyst0
+      - resource_id: project_long_term.resource_analyst
         useability: 80.0
-      - resource_id: project_long_term.resource_resource_programmer0
+      - resource_id: project_long_term.resource_developer
         useability: 30.0
-      - resource_id: project_long_term.resource_resource_webdesigner0
+      - resource_id: project_long_term.resource_designer
         useability: 30.0
     
     
@@ -35,66 +34,60 @@
   Create the phase task 'Develop GUI for Server Configuration'
 - 
   !record {model: project.task, id: project_task_t0}:
-    name: t1
+    name: Develop GUI for Server Configuration
     planned_hours: 20.0
     remaining_hours: 20.0
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_userdeveloper0
+    user_id: project_long_term.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
 - 
   !record {model: project.task, id: project_task_t1}:
-    name: t2
+    name: Develop GUI for Modules Configuration
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_userdeveloper0
+    user_id: project_long_term.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
   !record {model: project.task, id: project_task_t2}:
-    name: t3
+    name: Develop GUI for OpenERP Synchronisation
     planned_hours: 30.0
     remaining_hours: 30.0
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_userdeveloper0
+    user_id: project_long_term.res_users_developer
 - 
-  Create the phase task 'Develop required Menus'
+  Create the phase task 'Design required GUI/Menus'
 - 
   !record {model: project.task, id: project_task_3}:
-    name: t4
+    name: Design required GUI/Menus
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_userdesign0
+    user_id: project_long_term.res_users_designer
     
 - 
   Schedule phase tasks
 - 
-  !python {model: project.schedule.tasks}: |
-      res = self.compute_date(cr, uid, {"lang": "en_US", "tz": False,
-            "active_id": ref("project_phase_phase0"),
-            # rest may be obsolete:
-            # "active_model": "project.phase", "active_ids": [ref("project_phase_phase0")],
-            # "record_id": 138, "project_id": ref("project_project_project0"), 
-            })
-      print res
+  !python {model: project.phase}: |
+      res = self.schedule_tasks(cr, uid, [ref("project_phase_phase0")])
 
 -
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.phase}: |
-     phase=self.browse(cr, uid, [ref("project_phase_phase0")])[0]
+     phase = self.browse(cr, uid, [ref("project_phase_phase0")])[0]
      for task in phase.task_ids:
         if (not task.user_id) or (not task.date_start) or (not task.date_end):
            raise AssertionError("Phase Tasks not scheduled: %d uid=%r start=%r end=%r" % \
-                    (task.id, task.user_id, task.date_start, task.date_end))
\ No newline at end of file
+                    (task.id, task.user_id, task.date_start, task.date_end))
diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml
index 66bca5ff97d..e06feaaa4ca 100644
--- a/addons/project_long_term/test/schedule_project_phases.yml
+++ b/addons/project_long_term/test/schedule_project_phases.yml
@@ -2,7 +2,6 @@
   Create a project 'World Bank's Project'
 - 
   !record {model: project.project, id: project_project_worldbanksproject0}:
-    company_id: base.main_company
     name: "World Bank's Project"
     priority: 4
     
@@ -15,7 +14,6 @@
     name: "Defining Client's Basic Idea of Project"
     product_uom: product.uom_day
     project_id: project_project_worldbanksproject0
-    state: draft
     
     
 - 
@@ -27,7 +25,6 @@
     name: Establishing Project Feasibility
     product_uom: product.uom_day
     project_id: project_project_worldbanksproject0
-    state: draft
 
 - 
   Create project phase 'Preparation of Engineering Designs'
@@ -38,7 +35,6 @@
     name: Preparation of Engineering Designs
     product_uom: product.uom_hour
     project_id: project_project_worldbanksproject0
-    state: draft
     
     
 - 
@@ -50,7 +46,6 @@
     name: Procurement of Works and Goods
     product_uom: product.uom_hour
     project_id: project_project_worldbanksproject0
-    state: draft
     
     
 - 
@@ -62,7 +57,6 @@
     name: Project Construction
     product_uom: product.uom_hour
     project_id: project_project_worldbanksproject0
-    state: draft
     
     
 - 
@@ -74,7 +68,6 @@
     name: Project Completion
     product_uom: product.uom_hour
     project_id: project_project_worldbanksproject0
-    state: draft
 
 - 
   Set previous phase for phase 'Establishing Project Feasibility'
@@ -125,11 +118,8 @@
 - 
   Schedule project phases
 - 
-  !python {model: project.compute.phases}: |
-    self.check_selection(cr, uid, [ref("project_compute_phases_0")], {"lang": "en_US",
-      "project_id": False, "tz": False, "active_model": "ir.ui.menu", "department_id":
-      False, "section_id": False, "record_id": 279, "active_ids": [ref("project_long_term.menu_compute_phase")],
-      "active_id": ref("project_long_term.menu_compute_phase"), })
+  !python {model: project.project}: |
+    self.schedule_phases(cr, uid, ref("project_project_worldbanksproject0"))
       
 -
   Check if phases scheduled, check that either of phase's start_date, end_date and user_id is not null
@@ -140,4 +130,4 @@
         if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end):
      	   raise AssertionError("Tasks not scheduled")      
       
-   
\ No newline at end of file
+   
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index b1cd70487f7..dfc4cf1fc5e 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -2,103 +2,93 @@
   Create project 'Develop a thunderbird-openerp synchronization plugin'
 - 
   !record {model: project.project, id: project_project_project1}:
-    company_id: base.main_company
-    name: Project2
+    name: Develop a thunderbird-openerp synchronization plugin
     members:
-      - project_long_term.res_users_manager0
-      - project_long_term.res_users_user0
-      - project_long_term.res_users_userfinance0
-      - project_long_term.res_users_userdesign0
-      - project_long_term.res_users_userdeveloper0
-      - project_long_term.res_users_usertester0
-      - project_long_term.res_users_useranalyst0
+      - project_long_term.res_users_project_manager
+      - project_long_term.res_users_technical_leader
+      - project_long_term.res_users_developer
+      - project_long_term.res_users_designer
+      - project_long_term.res_users_tester
+      - project_long_term.res_users_analyst
+      - project_long_term.res_users_finacial_manager
         
 - 
-  Create phase 'Develop GUI' in Thunderbird
+  Create phase 'Develop GUI' in thunderbird
 - 
   !record {model: project.phase, id: project_phase_phase1}:
     date_start: '2010-06-02'
-    duration: 100.0
-    name: phase22
+    duration: 200.0
+    name: Develop GUI in thunderbird
     product_uom: product.uom_day
     project_id: project_project_project1
     state: draft
     resource_ids:
-      - resource_id: project_long_term.resource_resource_analyst0
+      - resource_id: project_long_term.resource_analyst
         useability: 80.0
-      - resource_id: project_long_term.resource_resource_programmer0
+      - resource_id: project_long_term.resource_developer
         useability: 30.0
-      - resource_id: project_long_term.resource_resource_webdesigner0
+      - resource_id: project_long_term.resource_designer
         useability: 30.0
     
     
 - 
   Create the phase task 'Develop GUI for Server Configuration'
 - 
-  !record {model: project.task, id: project_task_t00}:
-    name: t1
+  !record {model: project.task, id: project_task_t10}:
+    name: Develop GUI for Server Configuration
     planned_hours: 20.0
     remaining_hours: 20.0
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_userdeveloper0
+    user_id: project_long_term.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
 - 
   !record {model: project.task, id: project_task_t11}:
-    name: t2
+    name: Develop GUI for Modules Configuration
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_userdeveloper0
+    user_id: project_long_term.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
-  !record {model: project.task, id: project_task_t22}:
-    name: t3
+  !record {model: project.task, id: project_task_t12}:
+    name: Develop GUI for OpenERP Synchronisation
     planned_hours: 30.0
     remaining_hours: 30.0
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    
-    
+    user_id: project_long_term.res_users_developer
 - 
-  Create the phase task 'Develop required Menus'
+  Create the phase task 'Design required GUI/Menus'
 - 
-  !record {model: project.task, id: project_task_t33}:
-    name: t4
+  !record {model: project.task, id: project_task_13}:
+    name: Design required GUI/Menus
     planned_hours: 25.0
     remaining_hours: 25.0
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-
-- 
-  Get the project to schedule the tasks 
-- 
-  !record {model: project.compute.tasks, id: project_compute_tasks_0}:
-    project_id: project_project_project1
+    user_id: project_long_term.res_users_designer
     
     
 - 
   Schedule tasks
 - 
-  !python {model: project.compute.tasks}: |
-        self.compute_date(cr, uid, [ref("project_compute_tasks_0")], {"lang": "en_US", "tz": False,
-            "active_id": ref("project_long_term.menu_compute_tasks"),
-            "active_model": "ir.ui.menu", "active_ids": [ref("project_long_term.menu_compute_tasks")],
-        })
+  !python {model: project.project}: |
+        self.schedule_tasks(cr, uid, ref("project_project_project1"))
 
 -
   Check if tasks scheduled, check that either of task's start_date, end_date and user_id is not null
 -
   !python {model: project.project}: |
-     prj=self.browse(cr, uid, [ref("project_project_project1")])[0]
+     prj = self.browse(cr, uid, [ref("project_project_project1")])[0]
      for task in prj.tasks:
      	if (not task.user_id) or (not task.date_start) or (not task.date_end):
      	   raise AssertionError("Project Tasks not scheduled")
diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index 5056cad3b77..c1e6d838111 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -22,6 +22,5 @@
 import project_compute_phases
 import project_compute_tasks
 import project_schedule_tasks
-import working_calendar
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 75631fb3d18..c43dea56e91 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -18,18 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import datetime
-from resource.faces import *
-from new import classobj
-
 from tools.translate import _
 from osv import fields, osv
 
-import working_calendar as wkcal
-
 class project_compute_phases(osv.osv_memory):
-
     _name = 'project.compute.phases'
     _description = 'Project Compute Phases'
     _columns = {
@@ -48,118 +41,24 @@ class project_compute_phases(osv.osv_memory):
         data_select = self.read(cr, uid, ids, ['target_project'])[0]
         return self.compute_date(cr, uid, ids, context=context)
 
-    def _phase_schedule(self, cr, uid, phase, start_date, calendar_id=False, context=None):
-       if context is None:
-            context = {}
-       """Schedule phase with the start date till all the next phases are completed.
-
-       Arguements: start_dsate -- start date for the phase
-                   calendar_id -- working calendar of the project
-
-       """
-       phase_obj = self.pool.get('project.phase')
-       resource_obj = self.pool.get('resource.resource')
-       uom_obj = self.pool.get('product.uom')
-       phase_resource_obj = False
-       if context is None:
-           context = {}
-       if phase:
-            leaves = []
-            time_efficiency = 1.0
-            resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)])
-
-            if resource_id:
-                # Create a new resource object with
-                # all the attributes of the Resource Class
-                resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
-                time_efficiency = resource.time_efficiency
-                leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource.id, resource.calendar_id.id)
-            if not phase.responsible_id:
-                raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
-            phase_resource_obj = classobj((phase.responsible_id.name.encode('utf8')), (Resource,),{
-                                                   '__doc__': phase.responsible_id.name,
-                                                   '__name__': phase.responsible_id.name,
-                                                   'vacation': tuple(leaves),
-                                                   'efficiency': time_efficiency
-                                                })
-            default_uom_id = phase_obj._get_default_uom_id(cr, uid)
-            avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-            duration = str(avg_hours) + 'H'
-            # Create a new project for each phase
-            def Project():
-                start = start_date
-                minimum_time_unit = 1
-                resource = phase_resource_obj
-                # If project has working calendar then that
-                # else the default one would be considered
-                if calendar_id:
-                    working_days = wkcal.compute_working_calendar(cr, uid, calendar_id, context=context)
-                    vacation = tuple(wkcal.compute_leaves(cr, uid, calendar_id))
-
-                def phase():
-                    effort = duration
-
-            project = BalancedProject(Project)
-            s_date = project.phase.start.to_datetime()
-            e_date = project.phase.end.to_datetime()
-            # Recalculate date_start and date_end
-            # according to constraints on date start and date end on phase
-            if phase.constraint_date_start and str(s_date) < phase.constraint_date_start:
-                start_date = datetime.datetime.strptime(phase.constraint_date_start, '%Y-%m-%d')
-            else:
-                start_date = s_date
-            if phase.constraint_date_end and str(e_date) > phase.constraint_date_end:
-                end_date= datetime.datetime.strptime(phase.constraint_date_end, '%Y-%m-%d')
-                date_start = phase.constraint_date_end
-            else:
-                end_date = e_date
-                date_start = end_date
-            # Write the calculated dates back
-            ctx = context.copy()
-            ctx.update({'scheduler': True})
-            phase_obj.write(cr, uid, [phase.id], {
-                                          'date_start': start_date.strftime('%Y-%m-%d'),
-                                          'date_end': end_date.strftime('%Y-%m-%d')
-                                        }, context=ctx)
-
-            # Recursive call till all the next phases scheduled
-            for phase in phase.next_phase_ids:
-               if phase.state in ['draft', 'open', 'pending']:
-                   id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-                   self._phase_schedule(cr, uid, phase, date_start, id_cal, context=context)
-               else:
-                   continue
-
+    
     def compute_date(self, cr, uid, ids, context=None):
         """
         Compute the phases for scheduling.
         """
-
         if context is None:
             context = {}
-        phase_obj = self.pool.get('project.phase')
+        project_pool = self.pool.get('project.project')
         data = self.read(cr, uid, ids, [], context=context)[0]
         if not data['project_id'] and data['target_project'] == 'one':
             raise osv.except_osv(_('Error!'), _('Please Specify Project to be schedule'))
+
         if data['project_id']:        # If project mentioned find its phases
-            project_id = data['project_id']
-            phase_ids = phase_obj.search(cr, uid, [('project_id', '=', project_id),
-                                                  ('state', 'in', ['draft', 'open', 'pending']),
-                                                  ('previous_phase_ids', '=', False)
-                                                  ])
+            project_ids = [data['project_id']]
         else:                        # Else take all the draft,open,pending states phases
-            phase_ids = phase_obj.search(cr, uid,[('state', 'in', ['draft', 'open', 'pending']),
-                                                  ('previous_phase_ids', '=', False)
-                                                  ], context=context)
-        phase_ids.sort()
-        phases = phase_obj.browse(cr, uid, phase_ids, context=context)
-        for phase in phases:
-            start_date = phase.project_id.date_start
-            if not phase.project_id.date_start:
-                start_date = datetime.datetime.now().strftime("%Y-%m-%d")
-            start_dt = datetime.datetime.strftime((datetime.datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
-            calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-            self._phase_schedule(cr, uid, phase, start_dt, calendar_id, context=context)
+            project_ids = project_pool.search(cr, uid, [], context=context)
+
+        project_pool.schedule_phases(cr, uid, project_ids, context=context)
         return self._open_phases_list(cr, uid, data, context=context)
 
     def _open_phases_list(self, cr, uid, data, context=None):
@@ -173,10 +72,7 @@ class project_compute_phases(osv.osv_memory):
         result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase_list')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['domain'] = [('state', 'not in', ['cancelled','done'])]
-        if data['project_id']:
-            result['domain'] = [('project_id', '=', data['project_id']),
-                                ('state', 'not in', ['cancelled','done'])]
+        result['context'] = {"search_default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
         return result
 
 project_compute_phases()
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 8e98f26b353..cb74649502f 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -20,14 +20,10 @@
 ##############################################################################
 
 import datetime
-from resource.faces import *
-from new import classobj
-import operator
 
 from tools.translate import _
 from osv import osv, fields
 
-import working_calendar as wkcal
 
 class project_compute_tasks(osv.osv_memory):
     _name = 'project.compute.tasks'
@@ -40,108 +36,32 @@ class project_compute_tasks(osv.osv_memory):
         """
         Schedule the tasks according to resource available and priority.
         """
-        project_obj = self.pool.get('project.project')
+        project_pool = self.pool.get('project.project')
         task_pool = self.pool.get('project.task')
-        resource_obj = self.pool.get('resource.resource')
-        user_obj = self.pool.get('res.users')
-
         if context is None:
             context = {}
-
+        context['compute_by'] = 'project'
         data = self.read(cr, uid, ids, [])[0]
         project_id = data['project_id']
-        project = project_obj.browse(cr, uid, project_id, context=context)
-        task_ids = task_pool.search(cr, uid, [('project_id', '=', project_id),
-                                              ('state', 'in', ['draft', 'open', 'pending'])
-                                              ])
-        if task_ids:
-            task_ids.sort()
-            tasks = task_pool.browse(cr, uid, task_ids, context=context)
-            calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            start_date = project.date_start
-            if not project.date_start:
-                start_date = datetime.datetime.now().strftime("%Y-%m-%d")
-            date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M")
-            # Create Resource Class objects which are the Project Members
-            resources = []
-            for user in project.members:
-                leaves = []
-                time_efficiency = 1.0
-                resource_id = resource_obj.search(cr, uid, [('user_id', '=', user.id)], context=context)
-                if resource_id:
-#                    resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
-                    resource = resource_obj.read(cr, uid, resource_id, ['calendar_id', 'time_efficiency'], context=context)[0]
-                    if resource.get('calendar_id', False):
-                       leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
-                    time_efficiency = resource.get('time_efficiency')
-                resources.append(classobj((user.name.encode('utf8')), (Resource,), {
-                                                                '__doc__': user.name,
-                                                                '__name__': user.name,
-                                                                'vacation': tuple(leaves),
-                                                                'efficiency': time_efficiency
-                                                            }))
-            priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300,'4': 100}
-            # Create dynamic no of tasks with the resource specified
-            def create_tasks(j, eff, priorty=500, obj=None):
-                def task():
-                    """
-                    task is a dynamic method!
-                    """
-                    effort = eff
-                    if obj:
-                        resource = obj
-                    priority = priorty
-                task.__doc__ = "TaskNO%d" %j
-                task.__name__ = "task%d" %j
-                return task
+        project_pool.schedule_tasks(cr, uid, [project_id], context=context)
+        return self._open_task_list(cr, uid, data, context=context)
 
-            # Create a 'Faces' project with all the tasks and resources
-            def Project():
-                title = project.name
-                start = date_start
-                try:
-                    resource = reduce(operator.or_, resources)
-                except:
-                    raise osv.except_osv(_('Error'), _('Project must have members assigned !'))
-                minimum_time_unit = 1
-                if calendar_id:        # If project has calendar
-                    working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
-                    vacation = tuple(wkcal.compute_leaves(cr, uid, calendar_id))
-                # Dynamic Creation of tasks
-                i = 0
-                for each_task in tasks:
-                    hours = str(each_task.planned_hours )+ 'H'
-                    if each_task.priority in priority_dict.keys():
-                        priorty = priority_dict[each_task.priority]
-                    rcre = False
-                    if each_task.user_id:
-                       for resrce in resources:
-                            if resrce.__name__ == each_task.user_id.name: # check me!!
-                               rcre = resrce
-                               break
-                    task = create_tasks(i, hours, priorty, rcre)
-                    i += 1
-
-            project = BalancedProject(Project)
-            loop_no = 0
-            # Write back the computed dates
-            for t in project:
-                s_date = t.start.to_datetime()
-                e_date = t.end.to_datetime()
-                if loop_no == 0:
-                    project_obj.write(cr, uid, [project_id], {'date': e_date}, context=context)
-                else:
-                    ctx = context.copy()
-                    ctx.update({'scheduler': True})
-                    user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
-                    task_pool.write(cr, uid, [tasks[loop_no-1].id], {
-                                                         'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                         'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                         'user_id': user_id[0]
-                                                    }, context=ctx)
-
-                loop_no +=1
-        return {}
+    def _open_task_list(self, cr, uid, data, context=None):
+        """
+        Return the scheduled task list.
+        """
+        if context is None:
+            context = {}
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+        result = mod_obj._get_id(cr, uid, 'project', 'action_view_task')
+        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
+        result = {}
+        if not id:
+            return result
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result['context'] = {"search_default_project_id":data['project_id'], "search_default_user_id":uid, "search_default_current": 1}
+        return result
 
 project_compute_tasks()
 
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index c64e800c9c6..0d9e9f381f1 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -20,17 +20,9 @@
 ##############################################################################
 
 import datetime
-from resource.faces import *
-from new import classobj
-import operator
-
 from tools.translate import _
-from osv import osv, fields
-
-import working_calendar as wkcal
-
+from osv import fields, osv
 class project_schedule_task(osv.osv_memory):
-
     _name = "project.schedule.tasks"
     _description = 'project.schedule.tasks'
     _columns = {
@@ -46,126 +38,17 @@ class project_schedule_task(osv.osv_memory):
         res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
         self.compute_date(cr, uid, context=context)
         return res
-
-    def create_resources(self, cr, uid, phase, context=None):
-        """
-        Return a list of  Resource Class objects for the resources allocated to the phase.
-        """
-        resource_objs = []
-
-        if context is None:
-            context = {}
-
-        for resource in phase.resource_ids:
-            res = resource.resource_id
-            leaves = []
-            resource_eff = res.time_efficiency
-            resource_cal = res.calendar_id.id
-            if resource_cal:
-                cal_id  = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-                leaves = wkcal.compute_leaves(cr, uid, cal_id, res.id, resource_cal, context=context)
-            resource_objs.append(classobj(res.user_id.name.encode('utf8'), (Resource,),{
-                                             '__doc__': res.user_id.name,
-                                             '__name__': res.user_id.name,
-                                             'vacation': tuple(leaves),
-                                             'efficiency': resource_eff,
-                                          }))
-        return resource_objs
-
+    
     def compute_date(self, cr, uid, context=None):
         """
         Schedule the tasks according to resource available and priority.
         """
-
-        phase_obj = self.pool.get('project.phase')
-        task_obj = self.pool.get('project.task')
-        user_obj = self.pool.get('res.users')
-
+        phase_pool = self.pool.get('project.phase')
         if context is None:
-            # It makes no sense to continue on empty context
-            return { 'warning': _("You must select some project phase to compute on")}
-
+            context = {}
         if not 'active_id' in context:
             return {}
-        phase = phase_obj.browse(cr, uid, context['active_id'], context=context)
-        task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
-        if task_ids:
-            task_ids.sort()
-            tasks = task_obj.browse(cr, uid, task_ids, context=context)
-            start_date = str(phase.date_start)
-            if not phase.date_start:
-                if not phase.project_id.date_start:
-                    start_date = datetime.datetime.now().strftime("%Y-%m-%d")
-                else:
-                    start_date = phase.project_id.date_start
-            date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M")
-            calendar_id = phase.project_id.resource_calendar_id.id
-            resources = self.create_resources(cr, uid, phase)
-            priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300, '4': 100}
-            # Create dynamic no of tasks with the resource specified
-            def create_tasks(j, eff, priorty=500, obj=False):
-                def task():
-                    """
-                    task is a dynamic method!
-                    """
-                    effort = eff
-                    if obj:
-                        resource = obj
-                    priority = priorty
-                task.__doc__ = "TaskNO%d" %j
-                task.__name__ = "task%d" %j
-                return task
-
-            # Create a 'Faces' project with all the tasks and resources
-            def Project():
-                title = "Project"
-                start = date_start
-                try:
-                    resource = reduce(operator.or_, resources)
-                except:
-                    raise osv.except_osv(_('Error'), _('Phase must have resources assigned !'))
-                minimum_time_unit = 1
-                if calendar_id:            # If project has working calendar
-                    working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
-                    vacation = tuple(wkcal.compute_leaves(cr, uid, calendar_id))
-                # Dynamic creation of tasks
-                i = 0
-                for each_task in tasks:
-                    hours = str(each_task.planned_hours )+ 'H'
-                    if each_task.priority in priority_dict.keys():
-                        priorty = priority_dict[each_task.priority]
-                    resc = False
-                    if each_task.user_id:
-                        for resrce in resources:
-                            if resrce.__name__ == each_task.user_id.name:
-                                resc = resrce
-                                break
-                    
-                    task = create_tasks(i, hours, priorty, resc)
-                    i += 1
-
-            project = BalancedProject(Project)
-          
-            loop_no = 0
-            # Write back the computed dates
-            for t in project:
-                s_date = t.start.to_datetime()
-                e_date = t.end.to_datetime()
-                if loop_no > 0:
-                    ctx = context.copy()
-                    ctx.update({'scheduler': True})
-                    user_id = user_obj.search(cr, uid, [('name', '=', t.booked_resource[0].__name__)])
-                    task_obj.write(cr, uid, [tasks[loop_no-1].id], {
-                                                        'date_start': s_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                        'date_end': e_date.strftime('%Y-%m-%d %H:%M:%S'),
-                                                        'user_id': user_id[0]
-                                                    }, context=ctx)
-
-                loop_no += 1
-        else:
-            return {"warning": _("No tasks to compute for this phase") }
-        return {}
-
+        return phase_pool.schedule_tasks(cr, uid, [context['active_id']], context=context)
 project_schedule_task()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py
index 139875b6236..11c33874f28 100644
--- a/addons/project_long_term/wizard/working_calendar.py
+++ b/addons/project_long_term/wizard/working_calendar.py
@@ -18,107 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import datetime
-
 import pooler
 
-def convert_timeformat(cr, uid, time_string, context=None):
-        if context is None:
-            context = {}
-        """ Convert input time string: 8.5 to output time string 8:30."""
 
-        split_list = str(time_string).split('.')
-        hour_part = split_list[0]
-        mins_part = split_list[1]
-        round_mins = int(round(float(mins_part) * 60,-2))
-        converted_string = hour_part + ':' + str(round_mins)[0:2]
-        return converted_string
-
-def compute_leaves(cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
-   
-        if context is None:
-            context = {}
-
-        """Compute the leaves from the working calendar of the resource.
-
-       Arguements: calendar_id -- working calendar of the project
-                  resource_id -- resource working on phase/task
-                  resource_calendar -- working calendar of the resource
-
-        """
-
-        pool = pooler.get_pool(cr.dbname)
-        resource_calendar_leaves_obj = pool.get('resource.calendar.leaves')
-        leave_list = []
-        if resource_id:
-            leave_ids = resource_calendar_leaves_obj.search(cr, uid, ['|', ('calendar_id', '=', calendar_id),
-                                                                       ('calendar_id', '=', resource_calendar),
-                                                                       ('resource_id', '=', resource_id)
-                                                                      ], context=context)
-        else:
-            leave_ids = resource_calendar_leaves_obj.search(cr, uid, [('calendar_id', '=', calendar_id),
-                                                                      ('resource_id', '=', False)
-                                                                      ], context=context)
-        leaves = resource_calendar_leaves_obj.read(cr, uid, leave_ids, ['date_from', 'date_to'], context=context)
-        for i in range(len(leaves)):
-            dt_start = datetime.datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
-            dt_end = datetime.datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
-            no = dt_end - dt_start
-            [leave_list.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
-            leave_list.sort()
-        return leave_list
-
-def compute_working_calendar(cr, uid, calendar_id, context=None):
-
-        if context is None:
-            context = {}
-
-        """Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
-
-       Arguement: calendar_id -- working calendar of the project
-
-       """
-
-        pool = pooler.get_pool(cr.dbname)
-        resource_attendance_obj = pool.get('resource.calendar.attendance')
-        time_range = "8:00-8:00"
-        non_working = ""
-        week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
-        wk_days = {}
-        wk_time = {}
-        wktime_list = []
-        wktime_cal = []
-        week_ids = resource_attendance_obj.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
-        weeks = resource_attendance_obj.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
-        # Convert time formats into appropriate format required
-        # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
-        for week in weeks:
-            res_str = ""
-            if week_days.has_key(week['dayofweek']):
-                day = week_days[week['dayofweek']]
-                wk_days[week['dayofweek']] = week_days[week['dayofweek']]
-            hour_from_str = convert_timeformat(cr, uid, week['hour_from'])
-            hour_to_str = convert_timeformat(cr, uid, week['hour_to'])
-            res_str = hour_from_str + '-' + hour_to_str
-            wktime_list.append((day, res_str))
-        # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
-        for item in wktime_list:
-            if wk_time.has_key(item[0]):
-                wk_time[item[0]].append(item[1])
-            else:
-                wk_time[item[0]] = [item[0]]
-                wk_time[item[0]].append(item[1])
-        for k,v in wk_time.items():
-            wktime_cal.append(tuple(v))
-        # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
-        for k, v in wk_days.items():
-            if week_days.has_key(k):
-                week_days.pop(k)
-        for v in week_days.itervalues():
-            non_working += v + ','
-        if non_working:
-            wktime_cal.append((non_working[:-1], time_range))
-        return wktime_cal
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index a3cd66d219a..6a41f5ae72f 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -22,10 +22,11 @@
 from datetime import datetime, timedelta
 import time
 import math
-
+from faces import *
+from new import classobj
 from osv import fields, osv
 from tools.translate import _
-
+import tools
 class resource_calendar(osv.osv):
     _name = "resource.calendar"
     _description = "Resource Calendar"
@@ -187,6 +188,14 @@ class resource_calendar_attendance(osv.osv):
     _order = 'dayofweek, hour_from'
 resource_calendar_attendance()
 
+def convert_timeformat(time_string):
+    split_list = str(time_string).split('.')
+    hour_part = split_list[0]
+    mins_part = split_list[1]
+    round_mins = int(round(float(mins_part) * 60,-2))
+    converted_string = hour_part + ':' + str(round_mins)[0:2]
+    return converted_string
+
 class resource_resource(osv.osv):
     _name = "resource.resource"
     _description = "Resource Detail"
@@ -207,18 +216,7 @@ class resource_resource(osv.osv):
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=context)
     }
 
-    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
-        if context is None:
-            context = {}
-
-        if context.get('project_id',False):
-            project_pool = self.pool.get('project.project')
-            project_rec = project_pool.browse(cr, uid, context['project_id'])
-            user_ids = [user_id.id for user_id in project_rec.members]
-            args.append(('user_id','in',user_ids))
-
-        return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
-
+    
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -226,6 +224,110 @@ class resource_resource(osv.osv):
             default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
         return super(resource_resource, self).copy(cr, uid, id, default, context)
 
+    def generate_resources(self, cr, uid, user_ids, calendar_id, context=None):
+        """
+        Return a list of  Resource Class objects for the resources allocated to the phase.
+        """
+        if context is None:
+            context = {}
+        resource_objs = []
+        user_pool = self.pool.get('res.users')
+        for user in user_pool.browse(cr, uid, user_ids, context=context):
+            resource_ids = self.search(cr, uid, [('user_id', '=', user.id)], context=context)
+            #assert len(resource_ids) < 1, "User should not has more than one resources"
+            leaves = []
+            resource_eff = 1.0
+            if resource_ids:
+                resource_id = resource_ids[0]    
+                resource = self.browse(cr, uid, resource_id, context=context)
+                resource_eff = resource.time_efficiency
+                resource_cal = resource.calendar_id.id
+                if resource_cal:
+                    leaves = self.compute_vacation(cr, uid, calendar_id, resource.id, resource_cal, context=context)
+            resource_objs.append(classobj(str(user.name), (Resource,),{
+                                             '__doc__': user.name,
+                                             '__name__': user.name,
+                                             'vacation': tuple(leaves),
+                                             'efficiency': resource_eff,
+                                          }))
+        return resource_objs
+
+    def compute_vacation(self, cr, uid, calendar_id, resource_id=False, resource_calendar=False, context=None):
+        """
+        Compute the vacation from the working calendar of the resource.
+        @param calendar_id : working calendar of the project
+        @param resource_id : resource working on phase/task
+        @param resource_calendar : working calendar of the resource
+        """
+        if context is None:
+            context = {}
+        resource_calendar_leaves_pool = self.pool.get('resource.calendar.leaves')
+        leave_list = []
+        if resource_id:
+            leave_ids = resource_calendar_leaves_pool.search(cr, uid, ['|', ('calendar_id', '=', calendar_id),
+                                                                       ('calendar_id', '=', resource_calendar),
+                                                                       ('resource_id', '=', resource_id)
+                                                                      ], context=context)
+        else:
+            leave_ids = resource_calendar_leaves_pool.search(cr, uid, [('calendar_id', '=', calendar_id),
+                                                                      ('resource_id', '=', False)
+                                                                      ], context=context)
+        leaves = resource_calendar_leaves_pool.read(cr, uid, leave_ids, ['date_from', 'date_to'], context=context)
+        for i in range(len(leaves)):
+            dt_start = datetime.datetime.strptime(leaves[i]['date_from'], '%Y-%m-%d %H:%M:%S')
+            dt_end = datetime.datetime.strptime(leaves[i]['date_to'], '%Y-%m-%d %H:%M:%S')
+            no = dt_end - dt_start
+            [leave_list.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))]
+            leave_list.sort()
+        return leave_list
+
+    def compute_working_calendar(cr, uid, calendar_id, context=None):
+        """
+        Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
+        @param calendar_id : working calendar of the project
+        """
+        if context is None:
+            context = {}
+        resource_attendance_pool = self.pool.get('resource.calendar.attendance')
+        time_range = "8:00-8:00"
+        non_working = ""
+        week_days = {"0": "mon", "1": "tue", "2": "wed","3": "thu", "4": "fri", "5": "sat", "6": "sun"}
+        wk_days = {}
+        wk_time = {}
+        wktime_list = []
+        wktime_cal = []
+        week_ids = resource_attendance_pool.search(cr, uid, [('calendar_id', '=', calendar_id)], context=context)
+        weeks = resource_attendance_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'], context=context)
+        # Convert time formats into appropriate format required
+        # and create a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+        for week in weeks:
+            res_str = ""
+            if week_days.has_key(week['dayofweek']):
+                day = week_days[week['dayofweek']]
+                wk_days[week['dayofweek']] = week_days[week['dayofweek']]
+            hour_from_str = convert_timeformat(cr, uid, week['hour_from'])
+            hour_to_str = convert_timeformat(cr, uid, week['hour_to'])
+            res_str = hour_from_str + '-' + hour_to_str
+            wktime_list.append((day, res_str))
+        # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
+        for item in wktime_list:
+            if wk_time.has_key(item[0]):
+                wk_time[item[0]].append(item[1])
+            else:
+                wk_time[item[0]] = [item[0]]
+                wk_time[item[0]].append(item[1])
+        for k,v in wk_time.items():
+            wktime_cal.append(tuple(v))
+        # Add for the non-working days like: [('sat, sun', '8:00-8:00')]
+        for k, v in wk_days.items():
+            if week_days.has_key(k):
+                week_days.pop(k)
+        for v in week_days.itervalues():
+            non_working += v + ','
+        if non_working:
+            wktime_cal.append((non_working[:-1], time_range))
+        return wktime_cal
+
 resource_resource()
 
 class resource_calendar_leaves(osv.osv):
@@ -261,4 +363,4 @@ class resource_calendar_leaves(osv.osv):
 
 resource_calendar_leaves()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 7a027ed7f25e8e7f5f66bba38873bc636c41a3b9 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 24 Sep 2010 14:59:12 +0530
Subject: [PATCH 69/71] [REM] project_long_term: remove working_calendar.py. it
 is merged in resource module

bzr revid: hmo@tinyerp.com-20100924092912-onu5yhjf43me31fy
---
 .../wizard/working_calendar.py                | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 addons/project_long_term/wizard/working_calendar.py

diff --git a/addons/project_long_term/wizard/working_calendar.py b/addons/project_long_term/wizard/working_calendar.py
deleted file mode 100644
index 11c33874f28..00000000000
--- a/addons/project_long_term/wizard/working_calendar.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero 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 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/>.
-#
-##############################################################################
-import datetime
-import pooler
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 621f24aee4ded5f4982e4c16c0f8cb46f1a3607a Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 24 Sep 2010 15:17:12 +0530
Subject: [PATCH 70/71] [FIX] project_long_term: fix if not resource allocation
 or project member

bzr revid: hmo@tinyerp.com-20100924094712-f7cl79s1zaw3vtuq
---
 addons/project_long_term/project_long_term.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 05eca01887c..79837416d97 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -513,7 +513,10 @@ class project_task(osv.osv):
         def Project():
             title = "Project"
             start = datetime.strftime(datetime.strptime(start_date, "%Y-%m-%d"), "%Y-%m-%d %H:%M")
-            resource = reduce(operator.or_, resources)
+            try:
+                resource = reduce(operator.or_, resources)
+            except:
+                raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!'))
             minimum_time_unit = 1
             if calendar_id:            # If project has working calendar
                 working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)

From 5f9a3f20d8b38566f20b2f6dd054aad6cd31d5f6 Mon Sep 17 00:00:00 2001
From: "RON (OpenERP)" <>
Date: Mon, 27 Sep 2010 12:44:23 +0530
Subject: [PATCH 71/71] [IMP]: process: Usablilty Improvements in process views
 and menus

bzr revid: rpa@tinyerp.com-20100927071423-5ppccn42yuxvswfn
---
 addons/process/process_view.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index b743c82f84f..f33af42c533 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -35,7 +35,7 @@
                                     <field name="flow_start"/>
                                     <field name="kind" select="1"/>
                                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                        
+
                                 </group>
                                 <notebook colspan="4">
 	                                <page string="Properties">
@@ -74,14 +74,14 @@
 		                                   </group>
 		                                </group>
 		                            </page>
-                	                <page string="Notes">        
+                	                <page string="Notes">
 	                                   <field name="note" nolabel="1" colspan="4"/>
 	                                </page>
 	                            </notebook>
                             </form>
                         </field>
                     </page>
-                    <page string="Extra Information">
+                    <page string="Notes">
                         <field name="note" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
@@ -114,7 +114,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4">
-                        <filter string="Object" icon="terp-personal" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
                     </group>
                 </search>
             </field>
@@ -160,7 +160,7 @@
                     <field name="flow_start"/>
                     <field name="kind" select="1"/>
                     <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
-                    
+
                 </group>
                 <notebook colspan="4">
 	                <page string="Properties">
@@ -199,7 +199,7 @@
 		                    </group>
 		                </group>
 		            </page>
-	                <page string="Notes">        
+	                <page string="Notes">
 	                   <field name="note" nolabel="1" colspan="4"/>
 	                </page>
 	            </notebook>
@@ -220,8 +220,8 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Group By..." colspan="4" col="4">
-                    <filter string="Object" icon="terp-personal" domain="[]" context="{'group_by':'model_id'}"/>
-                    <filter string="Kind Of Node" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'kind'}"/>
+                    <filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
+                    <filter string="Kind Of Node" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'kind'}"/>
                 </group>
             </search>
         </field>
@@ -261,9 +261,8 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Process Transition">
-                <group>
+                <group col="6" colspan="4">
                     <field name="name" select="1"/>
-                    <newline/>
                     <field name="source_node_id" select="1"/>
                     <field name="target_node_id" select="1"/>
                 </group>
@@ -308,11 +307,13 @@
                     <field name="source_node_id"/>
                     <field name="target_node_id" />
                 </group>
+<!--
                 <newline/>
                 <group expand="0" string="Group By..." colspan="4" col="4">
                     <filter string="Source Node" icon="terp-personal" domain="[]" context="{'group_by':'source_node_id'}"/>
                     <filter string="Target Node" icon="terp-personal" domain="[]" context="{'group_by':'target_node_id'}"/>
                 </group>
+-->
             </search>
         </field>
     </record>