From d802ed107b1f80b36897faa9cda66c175ce5d5c9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 5 Feb 2010 18:03:21 +0530
Subject: [PATCH 01/21] [IMP] Set sequence for Financial Management menu and
 Project Management menu

bzr revid: vir@tinyerp.com-20100205123321-73a02663xixrt8rc
---
 addons/account/account_menuitem.xml                   | 2 +-
 addons/account_budget/crossovered_budget_view.xml     | 2 +-
 addons/base_contact/base_contact_view.xml             | 3 +--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +-
 addons/project/project_view.xml                       | 2 +-
 addons/report_timesheet/report_timesheet_view.xml     | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index f1dda334830..260d14e38e8 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index bdb8bfd4c8f..063594553e3 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -295,7 +295,7 @@
             menu="False"/>-->
 
 		<!--Menu for project management-->
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
 		<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index d4b99e11a85..bbc251d4b5f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -115,8 +115,6 @@
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
-    <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
-
 
     <!-- Views for Partners -->
 
@@ -353,6 +351,7 @@
         </field>
     </record>
 
+
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c9cfc6caeaf..e47662152c2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -220,7 +220,7 @@
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
         <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7703142e4d9..995fdcfbe51 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
 
          <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 087dda92817..79086640262 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -370,7 +370,7 @@
             <field name="view_id" ref="view_random_timesheet_lines_tree"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"

From 9d3f892cf9e0d16a5628c973824406795cad698c Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 5 Feb 2010 18:47:54 +0530
Subject: [PATCH 02/21] Improved Tasks Scheduling with automatic resource
 allocation

bzr revid: rvo@tinyerp.co.in-20100205131754-nvvat791orv6ru9k
---
 addons/project/wizard/compute_tasks_date.py | 216 +++++++++++---------
 addons/resource/faces/task.py               |  76 ++++---
 2 files changed, 160 insertions(+), 132 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index db3c52ba7f2..4dbd1c4495b 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -24,6 +24,8 @@ import pooler
 from tools.translate import _
 import datetime
 from resource.faces import *
+from new import classobj
+import operator
 
 compute_form = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
@@ -32,7 +34,7 @@ compute_form = """<?xml version="1.0" ?>
 
 success_msg = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed scccessfully."/>
+    <label string="Task Scheduling completed successfully."/>
 </form>"""
 
 compute_fields = {
@@ -40,18 +42,18 @@ compute_fields = {
 
 }
 def timeformat_convert(cr, uid, time_string, context={}):
+#    Function to convert input time string:: 8.5 to output time string 8:30
+
         strg = str(time_string)[-2:]
         last_strg = str(time_string)[0:-2]
         if strg != '.0':
             if '.' not in strg:
                 strg = '.' + strg
                 last_strg = str(time_string)[:-3]
-
             new_strg = round(float(strg) / 0.016666667)
             converted_strg = last_strg + ':' + str(new_strg)[:-2]
         else:
             converted_strg = last_strg + ':00'
-
         return converted_strg
 
 class wizard_compute_tasks(wizard.interface):
@@ -63,115 +65,145 @@ class wizard_compute_tasks(wizard.interface):
         resource_pool = pool.get('resource.resource')
         resource_leaves_pool = pool.get('resource.calendar.leaves')
         resource_week_pool = pool.get('resource.calendar.week')
-        
+        user_pool = pool.get('res.users')
+
         project_id = data['form']['project_id']
         project = project_pool.browse(cr,uid,project_id)
         task_ids = task_pool.search(cr,uid,[('project_id','=',project_id)])
         if task_ids:
+            wktime_cal = []
+            leaves = []
+            task_ids.sort()
             task_obj = task_pool.browse(cr,uid,task_ids)
             task_1 = task_obj[0]
-            if task_1.date_start:
-                date_dt = datetime.datetime.strptime(task_1.date_start,"%Y-%m-%d %H:%M:%S")
-            else:
-                date_dt = datetime.datetime.strptime(project.date_start,"%Y-%m-%d")
-            dt = datetime.datetime.strftime(date_dt,"%Y-%m-%d %H:%M")
+            dt_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
+            calendar_id = project.resource_calendar_id.id
 
-            for i in range(len(task_obj)):
-                final_lst = []
-                leaves = []
-                if task_obj[i].user_id.id:
-                    resource_id = resource_pool.search(cr,uid,[('user_id','=',task_obj[i].user_id.id)])
-                    if resource_id :
-                        resource_obj = resource_pool.browse(cr,uid,resource_id)[0]
-                        if resource_obj.calendar_id:
-                            calendar_id = resource_obj.calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',resource_id)])
-                        else:
-                            calendar_id = project.resource_calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
+#     If project has a working calendar then that would be used otherwise
+#     the default faces calendar would  be used
+            if calendar_id:
+                resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
+                time_range = "8:00-8:00"
+                non_working = ""
+                wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
+                wk_days = {}
+                wk_time = {}
+                wktime_list = []
+                week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+                week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
 
-                        time_range = "8:00-8:00"
-                        non_working = ""
-                        wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
-                        wk_days = {}
-                        wk_time = {}
-                        tlist = []
-                        week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-                        week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+#     Converting time formats into appropriate format required
+#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+                for week in week_obj:
+                    res_str = ""
+                    if wk.has_key(week['dayofweek']):
+                        day = wk[week['dayofweek']]
+                        wk_days[week['dayofweek']] = wk[week['dayofweek']]
 
-                        for week in week_obj:
-                            res_str = ""
-                            if wk.has_key(week['dayofweek']):
-                                day = wk[week['dayofweek']]
-                                wk_days[week['dayofweek']] = wk[week['dayofweek']]
+                    hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
+                    hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
+                    res_str = hour_from_str + '-' + hour_to_str
+                    wktime_list.append((day,res_str))
 
-                            hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
-                            hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
-                            res_str = hour_from_str + '-' + hour_to_str
-                            tlist.append((day,res_str))
+#     Converting it to 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 item in tlist:
-                            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))
 
-                        for k,v in wk_time.items():
-                            final_lst.append(tuple(v))
+#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
+                for k,v in wk_days.items():
+                    if wk.has_key(k):
+                        wk.pop(k)
+                for v in wk.itervalues():
+                    non_working += v + ','
+                if non_working:
+                    wktime_cal.append((non_working[:-1],time_range))
 
-                        for k,v in wk_days.items():
-                            if wk.has_key(k):
-                                wk.pop(k)
-                        for v in wk.itervalues():
-                            non_working += v + ','
-                        if non_working:
-                            final_lst.append((non_working[:-1],time_range))
+#     If project working calendar has any leaves
+                if resource_leave_ids:
+                    res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+                    for leave in range(len(res_leaves)):
+                        dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                        dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                        no = dt_end - dt_start
+                        leave_days = no.days + 1
+                    [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+                    leaves.sort()
 
-                        if resource_leave_ids:
-                            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-                            for leave in range(len(res_leaves)):
-                                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                                no = dt_end - dt_start
-                                leave_days = no.days + 1
-                            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
-                            leaves.sort()
+#    To create resources which are the Project Members
+            resource = project.members
+            resource_objs = []
+            for no in range(len(resource)):
+                resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
+                resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name}))
 
+#     To create dynamic no of tasks
+            def tasks(j,eff):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                hours = task_obj[i].remaining_hours / task_obj[i].occupation_rate
-                hours = str(hours)[:-2] + 'H'
+#     To create dynamic no of tasks with the resource specified
+            def tasks_resource(j,eff,obj):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                    resource = obj
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                class user(Resource):
-                 pass
+#    Creating the project with all the tasks and resources
+            def Project():
+                resource = reduce(operator.or_,resource_objs)
+                title = project.name
+                start = dt_start
 
-                if i == 0:
-                    new_dt = dt
-                else:
-                    data = task_pool.read(cr,uid,[task_obj[i-1].id],['date_end'])[0]
-                    new_dt = data['date_end'][0:16]
-
-                def Project_1():
-                    resource = user
-                    title = project.name
-                    start = new_dt
-                    effort = hours
-
-                    if final_lst or leaves:
-                        working_days = final_lst
+#    If project has calendar
+                if wktime_cal or leaves:
+                        working_days = wktime_cal
                         vacation = tuple(leaves)
 
-                    def task1():
-                        start = new_dt
-                        effort = hours
-                        title = task_obj[i].name
-
-                project_1 = BalancedProject(Project_1)
-                s_date = project_1.calendar.WorkingDate(project_1.task1.start).to_datetime()
-                e_date = project_1.calendar.WorkingDate(project_1.task1.end).to_datetime()
-                task_pool.write(cr,uid,[task_obj[i].id],{'date_start':s_date,'date_end':e_date})
+#    Dynamic Creation of tasks
+                for i in range(len(task_obj)):
+                    hours = str(task_obj[i].planned_hours / task_obj[i].occupation_rate)[:-2] + 'H'
+                    if task_obj[i].user_id:
+                        for resource_object in resource_objs:
+                            if resource_object.__name__ == task_obj[i].user_id.name:
+                               task = tasks_resource(i,hours,resource_object)
+                    else:
+                        task = tasks(i,hours)
 
+            project = BalancedProject(Project)
+            task_no = len(task_obj)
+            loop_no = 0
+            for t in project:
+                no2 = loop_no
+                while loop_no <= task_no:
+                    s_date = t.start.to_datetime()
+                    e_date = t.end.to_datetime()
+                    print 'Start Date And End Date:::',s_date,e_date,t.name,t.booked_resource
+                    if loop_no != 0:
+                        user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
+                        task_pool.write(cr,uid,[task_obj[loop_no - 1].id],{'date_start':s_date,'date_end':e_date,'user_id':user_id[0]})
+                    loop_no = task_no + 1
+                loop_no = no2
+                loop_no +=1
         return {}
+
     states = {
         'init': {
             'actions': [],
@@ -180,7 +212,8 @@ class wizard_compute_tasks(wizard.interface):
                 ('compute', 'Compute')
             ]},
         },
-        
+
+
         'compute': {
             'actions': [_compute_date],
             'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
@@ -190,4 +223,3 @@ wizard_compute_tasks('wizard.compute.tasks')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 6fdb28db3f6..52614b654c3 100755
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -60,7 +60,7 @@ SMART = 1
 #@+node:Exceptions
 #@+node:class AttributeError
 class AttributeError(AttributeError):
-    #@	<< class AttributeError declarations >>
+    #@    << class AttributeError declarations >>
     #@+node:<< class AttributeError declarations >>
     is_frozen = False
 
@@ -72,7 +72,7 @@ class AttributeError(AttributeError):
 class RecursionError(Exception):
     """This exception is raised in cas of cirular dependencies
     within an project"""
-    #@	<< class RecursionError declarations >>
+    #@    << class RecursionError declarations >>
     #@+node:<< class RecursionError declarations >>
     pass
 
@@ -84,7 +84,7 @@ class RecursionError(Exception):
 class _IncompleteError(Exception):
     """This exception is raised, when there is not enough
     data specified to calculate as task"""
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, *args):
         if isinstance(args[0], (basestring)):
@@ -104,13 +104,13 @@ class _MeProxy(object):
     """
     A Proxy class for the me attribute of tasks in the compile case
     """
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = "task"
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task):
         object.__setattr__(self, "task", task)
@@ -153,6 +153,7 @@ class _MeProxy(object):
     #@-node:__setattr__
     #@+node:__iter__
     def __iter__(self):
+
         return iter(self.task)
     #@nonl
     #@-node:__iter__
@@ -172,25 +173,26 @@ class _MeProxyRecalc(_MeProxy):
     """
     A Proxy class for the me attribute of tasks in the recalc case
     """
-    #@	@+others
+    #@    @+others
     #@+node:__setattr__
     def __setattr__(self, name, value):
-        if self.task._properties.has_key(name):
+       if self.task._properties.has_key(name):
             self.task._set_attrib(name, value)
     #@-node:__setattr__
     #@-others
 #@-node:class _MeProxyRecalc
 #@+node:class _MeProxyError
 class _MeProxyError(_MeProxy):
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = ("task", "attrib", "exc")
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, attrib, exc):
+
         _MeProxy.__init__(self, task)
         object.__setattr__(self, "attrib", attrib)
         object.__setattr__(self, "exc", exc)
@@ -204,13 +206,13 @@ class _MeProxyError(_MeProxy):
 #@-node:class _MeProxyError
 #@+node:class _MeProxyWarn
 class _MeProxyWarn(_MeProxy):
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = ("task", "attrib", "message")
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, attrib, message):
         _MeProxy.__init__(self, task)
@@ -474,7 +476,7 @@ class _Path(object):
     find out the source attribute (task and attribute name)
     of the value.
     """
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, path_str):
         self._task = task
@@ -537,7 +539,7 @@ class _ValueWrapper(object):
     a return value of a task method. It contains the value,
     and the supplier of that value
     """
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, value, ref):
         self._value = value
@@ -718,7 +720,7 @@ class _NEVER_USED_:
 class _StringConverter(object):
     """This class is a helper for the to_string mechanism
     of tasks"""
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, source, format=None):
         self.source = source
@@ -1011,7 +1013,7 @@ def _calc_maxload(task, resource):
 #@+node:class AllocationAlgorithm
 class AllocationAlgorithm(object):
     """This class is a base for resource allocation algorithms"""
-    #@	@+others
+    #@    @+others
     #@+node:test_allocation
     def test_allocation(self, task, resource):
         """This method simulates the allocation of a specific resource.
@@ -1032,7 +1034,7 @@ class AllocationAlgorithm(object):
 #@+node:class StrictAllocator
 class StrictAllocator(AllocationAlgorithm):
     """This class implements the STRICT resource allocation"""
-    #@	@+others
+    #@    @+others
     #@+node:_distribute_len_loads
     def _distribute_len_loads(self, task, resource, effort, length):
         # A special load calculation, if effort and length are given.
@@ -1172,6 +1174,7 @@ class StrictAllocator(AllocationAlgorithm):
             effort = to_delta(length * factor\
                               + task.performed_effort).round()
 
+
         return (end, book_load), resource, calc_load, start, effort
     #@-node:test_allocation
     #@+node:allocate
@@ -1225,7 +1228,7 @@ class StrictAllocator(AllocationAlgorithm):
 
 
 class SmartAllocator(StrictAllocator):
-    #@	@+others
+    #@    @+others
     #@+node:balance
     def balance(self, task, start, delta, adjust_date,
                 calc_load, resource):
@@ -1262,7 +1265,7 @@ class SmartAllocator(StrictAllocator):
 
 
 class SloppyAllocator(AllocationAlgorithm):
-    #@	@+others
+    #@    @+others
     #@+node:test_allocation
     def test_allocation(self, task, resource):
         if task.__dict__.has_key("effort"):
@@ -1559,7 +1562,7 @@ def DailyMax(value):
 #@+node:Task
 #@+node:class _TaskProperty
 class _TaskProperty(object):
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, method):
         self.method = method
@@ -1575,7 +1578,7 @@ class _TaskProperty(object):
 #@-node:class _TaskProperty
 #@+node:class _RoundingTaskProperty
 class _RoundingTaskProperty(object):
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, method, name):
         self.method = method
@@ -1810,7 +1813,7 @@ class Task(object):
     #@nonl
     #@-node:<< description >>
     #@nl
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     # Variables for the gui interface
     _date_completion = { "Date": 'Date("|")',
@@ -1924,14 +1927,13 @@ class Task(object):
     #@nonl
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, func, name, parent=None, index=1):
 
         assert(type(func) == types.FunctionType)
 
         func_key = (func.func_code, func.func_closure and id(func.func_closure))
-
         try:
             instrumented = instrumentation_cache[func_key]
         except KeyError:
@@ -1941,7 +1943,7 @@ class Task(object):
 
         func.task_func = instrumented # will be used in the gui
         self._function = instrumented
-        self.name = name
+        self.name = func.func_name
         self.up = parent
         self.children = []
         self._sources = {} # all tasks, I am linked to
@@ -2187,7 +2189,6 @@ class Task(object):
     def formatter(self, attrib_name, arg=None, format=None):
         """returns a function which is able
         to convert the value of the given attrib_name to a string"""
-
         formats = self.formats
         format = format or formats.get(attrib_name)
 
@@ -2548,7 +2549,6 @@ class Task(object):
     #@+node:Setting methods
     #@+node:_set_attrib
     def _set_attrib(self, name, value):
-
         if value is _NEVER_USED_: return
 
         try:
@@ -2715,7 +2715,6 @@ class Task(object):
             value = reduce(lambda a, b: a & b, value)
 
         self.resource = value()
-
     #@-node:_set_resource
     #@+node:_set_copy_src
     def _set_copy_src(self, value):
@@ -2796,7 +2795,6 @@ class Task(object):
     def __renew_dates(self):
         for attrib in ("effort", "start", "end", "length", "todo"):
             try:
-
                 self._set_attrib(attrib, self._original_values[attrib])
             except KeyError:
                 pass
@@ -2829,7 +2827,6 @@ class Task(object):
     #@-node:_set_extra_work
     #@+node:_set_working_days
     def _set_working_days(self, value):
-
         if type(value[0]) is str:
             value = (value, )
 
@@ -2859,7 +2856,6 @@ class Task(object):
     #@-node:_get_minimum_time_unit
     #@+node:_set_working_days_per_week
     def _set_working_days_per_week(self, value):
-
         self.__make_calendar()
         self.calendar.working_days_per_week = value
         self._properties["working_days_per_week"] = True
@@ -3349,7 +3345,7 @@ class _ProjectBase(Task):
     """
     Base class for all projects.
     """
-    #@	<< class _ProjectBase declarations >>
+    #@    << class _ProjectBase declarations >>
     #@+node:<< class _ProjectBase declarations >>
     __attrib_completions__ = { }
     __attrib_completions__.update(Task.__attrib_completions__)
@@ -3366,7 +3362,7 @@ class _ProjectBase(Task):
 
     #@-node:<< class _ProjectBase declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default", id=""):
         self.calendar = pcalendar.Calendar()
@@ -3450,13 +3446,13 @@ class Project(_ProjectBase):
     other projects in the resource database. The default value for id
     is the name of top_task.
     """
-    #@	<< class Project declarations >>
+    #@    << class Project declarations >>
     #@+node:<< class Project declarations >>
     __call_completion__ = 'Project(|top_task, scenario="_default", id=None)'
 
     #@-node:<< class Project declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default", id=None):
         _ProjectBase.__init__(self, top_task, scenario, id)
@@ -3474,7 +3470,7 @@ class Project(_ProjectBase):
 #@-node:class Project
 #@+node:class _AllocationPoject
 class _AllocationPoject(_ProjectBase):
-    #@	@+others
+    #@    @+others
     #@+node:unfreeze_parents
     def unfreeze_parents(self):
         if self.has_actual_data:
@@ -3490,14 +3486,14 @@ class BalancedProject(_AllocationPoject):
     Generates a project with allocated resources. The tasks are balanced
     to fit the resources load conditions.
     """
-    #@	<< class BalancedProject declarations >>
+    #@    << class BalancedProject declarations >>
     #@+node:<< class BalancedProject declarations >>
     __call_completion__ = """BalancedProject(|top_task, scenario="_default",
     id=None, balance=SMART, performed=None)"""
 
     #@-node:<< class BalancedProject declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default",
                  id=None, balance=SMART, performed=None):
@@ -3650,13 +3646,13 @@ class AdjustedProject(_AllocationPoject):
     adjusted to the actual tracking data and balanced to fit the
     resources load conditions.
     """
-    #@	<< class AdjustedProject declarations >>
+    #@    << class AdjustedProject declarations >>
     #@+node:<< class AdjustedProject declarations >>
     __call_completion__ = 'AdjustedProject(|base_project)'
 
     #@-node:<< class AdjustedProject declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, base_project):
         _AllocationPoject.__init__(self, base_project._function,
@@ -3852,4 +3848,4 @@ class AdjustedProject(_AllocationPoject):
 
 """
 #@-node:@file task.py
-#@-leo
+#@-leo
\ No newline at end of file

From 8c10c350129ae53f4f3fdd43b3897ca0e5c5ffb3 Mon Sep 17 00:00:00 2001
From: "RCH(OpenERP)" <>
Date: Fri, 5 Feb 2010 19:19:07 +0530
Subject: [PATCH 03/21] [IMP] Set sequence for all main menus

bzr revid: vir@tinyerp.com-20100205134907-3aczul2ggfqo0h7a
---
 .../account_analytic_analysis_menu.xml         |  2 +-
 addons/base_contact/base_contact_view.xml      |  2 +-
 .../base_report_designer_wizard.xml            |  2 +-
 addons/board/board_view.xml                    |  2 +-
 .../report_crm_project_bug_view.xml            |  2 +-
 addons/document/document_view.xml              |  2 +-
 addons/event/event_view.xml                    |  2 +-
 addons/hr/hr_view.xml                          |  2 +-
 addons/hr_attendance/hr_attendance_wizard.xml  |  2 +-
 addons/idea/idea_view.xml                      |  2 +-
 addons/lunch/lunch_view.xml                    |  2 +-
 addons/mrp/mrp_view.xml                        |  8 ++++----
 addons/olap/data/olap_view.xml                 |  2 +-
 addons/point_of_sale/pos_view.xml              |  2 +-
 addons/purchase/purchase_view.xml              |  4 ++--
 addons/resource/hr_view.xml                    |  2 +-
 addons/resource/resource_view.xml              |  2 +-
 addons/stock/stock_view.xml                    | 18 +++++++++---------
 addons/subscription/subscription_view.xml      |  2 +-
 addons/wiki/wiki_view.xml                      |  2 +-
 20 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 2862f7b7657..f9ea49e3b03 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
         <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index bbc251d4b5f..74c31c4203f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -427,7 +427,7 @@
         src_model="res.partner.address"
         />
 
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management" sequence="7"/>
     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index 3485428fbf5..8882d2de9e9 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,7 +8,7 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
-		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     	<menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 2b9341decd3..4b55e43c4dd 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
 <!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index 75f9818e7af..4c6ea353ec7 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="view_crm_project_bug_user_graph"/>
             <field name="search_view_id" ref="view_crm_project_bug_user_filter"/>
         </record>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="base.menu_project_report" sequence="1"/>
         <menuitem action="action_report_crm_project_bug_user_tree" id="menu_crm_project_bug_user_tree" parent="menu_crm_project_bug_tree"/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 3fa805388c0..658dfc3630e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 03110015779..58a1c4ea997 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" />
+		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
 		<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
 	<!-- EVENTS  -->
 		<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b93e7f658cd..66d9ee88dce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
       <!--  <menuitem
             id="menu_hr_reporting"
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index d95c9d86d50..a1ea01ea764 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,7 +12,7 @@
         <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>
         <!--Time Tracking menu for Project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fb705f820ca..177792966d5 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 61844e099cb..2011586c9b6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8d84a8c01fd..29d2ad7afc6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager"/>
+            groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
 
@@ -544,7 +544,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>                         
+					</group>
                </search>
             </field>
         </record>
@@ -762,7 +762,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>  
+					</group>
                 </search>
             </field>
         </record>
@@ -782,7 +782,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>            
+            <field name="view_mode">tree,form</field>
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index 306f9a29084..ac6b50711e6 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -8,7 +8,7 @@
 <!--        id="menu_bi"-->
 <!--        icon="terp-account" parent="base.next_id_50"/>-->
 
-    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     <menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index f0afcd1aac1..c05df176d56 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -165,7 +165,7 @@
                 </tree>
             </field>
         </record>
-        <menuitem name="Point of Sale" id="menu_point_root" />
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="New Sale" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
 		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 215add767d2..283192b2162 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -4,7 +4,7 @@
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
-            groups="group_purchase_user"/>
+            groups="group_purchase_user" sequence="7"/>
 	   <menuitem id="menu_procurement_management" name="Procurement Management"
             parent="base.menu_purchase_root" sequence="1"/>
 
@@ -165,7 +165,7 @@
 					<filter string="By Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
 					<filter string="By State" icon="terp-purchase" domain="[]"  context="{'group_by':'state'}"/>
 					<filter string="By Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
-				</group>                   
+				</group>
               </search>
             </field>
         </record>
diff --git a/addons/resource/hr_view.xml b/addons/resource/hr_view.xml
index abf3c5f023f..c0fc3c54ffd 100755
--- a/addons/resource/hr_view.xml
+++ b/addons/resource/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem
             id="menu_hr_reporting"
             name="Reporting"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5892b78fe5b..783f9c28bf2 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_pm_resources" name="Resources" parent="base.menu_main" sequence="2"/>
 
         <record id="resource_calendar_form" model="ir.ui.view">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e071ced7ae2..6aa2044ff2d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
    		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
@@ -669,7 +669,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                   
+					</group>
               </search>
             </field>
         </record>
@@ -794,8 +794,8 @@
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="By Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>                        
-					</group>                  
+						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+					</group>
               </search>
             </field>
         </record>
@@ -953,7 +953,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1113,7 +1113,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1166,7 +1166,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1285,7 +1285,7 @@
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Destion Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                       
+					</group>
             	</search>
             </field>
         </record>
@@ -1409,7 +1409,7 @@
 						<filter string="By Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                        
+					</group>
             	</search>
             </field>
         </record>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 0466d4501cf..67e641b54df 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 2188accd668..d2fa06d4fd5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
         <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>

From 8b33e20c8a9d609ced4e21b2c5f43832d4808cde Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 8 Feb 2010 10:13:31 +0530
Subject: [PATCH 04/21] [IMP] Changed the sequence for the Tools menus

bzr revid: vir@tinyerp.com-20100208044331-2ltdza8onybywva1
---
 addons/idea/idea_view.xml                 | 2 +-
 addons/lunch/lunch_view.xml               | 2 +-
 addons/subscription/subscription_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 177792966d5..f80e7156f04 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 2011586c9b6..449c0400905 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 67e641b54df..699896e3040 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->

From c6ea87b47ba7a54647d9c6ad0802b6b2909e698c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 8 Feb 2010 10:53:55 +0530
Subject: [PATCH 05/21] [IMP]:added
 invisible=context.get('show_delegated',True) to delegated task wizard

bzr revid: nch@tinyerp.com-20100208052355-u0jqjir0yubatejt
---
 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 788a44c9344..77927cf4172 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -364,7 +364,7 @@
                     <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" 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="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" />
+                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" invisible="context.get('show_delegated',True)" />
                     <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" 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"/>
                 </tree>

From 070d0a433825000baf8a84c6c5cea0b5498eaee2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 11:00:00 +0530
Subject: [PATCH 06/21] [FIX]: crm: typo

lp bug: https://launchpad.net/bugs/518657 fixed

bzr revid: rpa@openerp.co.in-20100208053000-oadjf8w578f9nuev
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index faf829e5e51..5cb39d37119 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -44,7 +44,7 @@
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
                     <field name="probability"/>
-                    <field name="date_deadline" string="Excepted Close Date" required="1"/>
+                    <field name="date_deadline" string="Expected Close Date" required="1"/>
                     <group colspan="4" col="5">
                     <label string="" colspan="2"/>
                     <button string="Schedule Meeting"

From 8615415e4f751f3851b2966cc927d2cad3bfbaf5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 11:35:22 +0530
Subject: [PATCH 07/21] [FIX] base: missing import pkg

bzr revid: hmo@tinyerp.com-20100208060522-gk6f6pzrqnumttgr
---
 bin/addons/base/res/res_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 83b0827a98e..b8c6ff54251 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -26,6 +26,7 @@ import pytz
 import pooler
 from tools.translate import _
 from service import security
+import netsvc
 
 class groups(osv.osv):
     _name = "res.groups"

From 93be43df7eadd33ac4c3c11ffbdf1cfd19642108 Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 8 Feb 2010 11:36:10 +0530
Subject: [PATCH 08/21] [IMP]:printscreen reports now use the context to not
 display invisible columns

bzr revid: nch@tinyerp.com-20100208060610-h9bwn80541ic2m6x
---
 bin/report/printscreen/ps_list.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 78729a571d5..8582514b19f 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -32,14 +32,16 @@ from datetime import datetime
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
+        self.context = {}
 
     def _parse_node(self, root_node):
         result = []
         for node in root_node:
-            if node.tag == 'field':
-                result.append(node.get('name'))
-            else:
-                result.extend(self._parse_node(node))
+            if not eval(str(node.attrib.get('invisible',False)),{'context':self.context}):
+                if node.tag == 'field':
+                    result.append(node.get('name'))
+                else:
+                    result.extend(self._parse_node(node))
         return result
 
     def _parse_string(self, view):
@@ -52,6 +54,7 @@ class report_printscreen_list(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if not context:
             context={}
+        self.context = context
         pool = pooler.get_pool(cr.dbname)
         model = pool.get(datas['model'])
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
@@ -64,7 +67,6 @@ class report_printscreen_list(report_int):
 
         datas['ids'] = ids
         model = pooler.get_pool(cr.dbname).get(datas['model'])
-
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
         fields_order = self._parse_string(result['arch'])
         rows = model.read(cr, uid, datas['ids'], result['fields'].keys(), context)
@@ -180,7 +182,7 @@ class report_printscreen_list(report_int):
                     d1 = datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
                     new_d1 = d1.strftime(format)
                     line[f] = new_d1
-                    
+
                 col = etree.SubElement(node_line, 'col', para='yes', tree='no')
                 if line[f] != None:
                     col.text = tools.ustr(line[f] or '')

From f6af6edc3b738a5a5ab12c825a4ce22a017979b5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:02:25 +0530
Subject: [PATCH 09/21] [IMP] quality_integration_server: Improve create db
 command after remove base_setup wizard

bzr revid: hmo@tinyerp.com-20100208063225-vf92p12wlran6yej
---
 .../base_quality_interrogation.py             | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 96c04e72ca6..afb8ecd0def 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -174,28 +174,7 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     if dbname in db_list:
         drop_db(uri, dbname)
     id = execute(conn,'create',admin_passwd, dbname, True, lang)
-    wait(id,uri)
-    uid = login_conn.login(dbname, user, pwd)
-
-    wiz_id = execute(wiz_conn,'create', dbname, uid, user, 'base_setup.base_setup')
-
-    state = 'init'
-    datas = {'form':{}}
-
-    while state!='config':
-        res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
-        if state=='init':
-            datas['form'].update( res['datas'] )
-        if res['type']=='form':
-            for field in res['fields'].keys():
-                datas['form'][field] = datas['form'].get(field,False)
-            state = res['state'][-1][0]
-            datas['form'].update({
-                'profile': -1
-            })
-        elif res['type']=='state':
-            state = res['state']
-    res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+    wait(id,uri)    
     install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
     return True
 

From f86e18f3fd76d60cc369e35b78f47f72f913a8c9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 12:25:26 +0530
Subject: [PATCH 10/21] [IMP] sale: add field in reporting and set default in
 search view

bzr revid: sbh@tinyerp.com-20100208065526-j30p0d711o1yuouo
---
 addons/sale/report_sale_view.xml | 20 +++++++++++---------
 addons/sale/sale_view.xml        |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 6bb33ad754b..1dc69f63bd3 100644
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -7,33 +7,34 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sale Orders">
-                	<field name="partner_id"/>
+                	<field name="partner_id" invisible="True"/>
                     <field name="date_order"/>
                     <field name="invoiced_rate"/>
                     <field name="picked_rate"/>
                     <field name="amount_untaxed"/>
                     <field name="amount_tax"/>
-                    <field name="amount_total"/>
+                    <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_sale_order_report_all" model="ir.actions.act_window">
-            <field name="name">Sale Orders By Month </field>
+            <field name="name">Sale Orders By Customer </field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="context">{'report':True}</field>
+            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
         </record>        
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim01">
+	    <record model="ir.actions.act_window.view" id="action_sale_order_01">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="sale.view_sale_order_report_tree"/>
 	        <field name="act_window_id" ref="action_sale_order_report_all"/>
 	    </record>        
-		<record model="ir.actions.act_window.view" id="action_order_product02">
+		<record model="ir.actions.act_window.view" id="action_sale_order_02">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_sale_order_graph"/>
@@ -51,10 +52,11 @@
                     <field name="name"/>
                     <field name="order_id" invisible="True"/>
                     <field name="product_uom_qty" />
-                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                     <field name="product_id"/>
                     <field name="price_unit" />
-                    <field name="discount"/>
+                    <field name="price_net"/>
                     <field name="price_subtotal" sum="Total"/>
                     <field name="state"/>
                 </tree>
@@ -77,7 +79,7 @@
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>   
 	    <record model="ir.actions.act_window.view" id="action_order_product02">
-	        <field name="sequence" eval="1"/>
+	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_order_line_graph"/>
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
@@ -86,7 +88,7 @@
 	<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="base.next_id_64" sequence="3"/>
     
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="4"/>
      
       </data>
     </openerp>    
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ec7d9d0a081..9eee62b95d7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -412,7 +412,7 @@
                             <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        

From e0bdc8480658370cd6a02e32330ffad135d70374 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:46:56 +0530
Subject: [PATCH 11/21] [FIX] project: when delegrated user close task, parent
 task should reopen if pending

bzr revid: hmo@tinyerp.com-20100208071656-o2omd39a55oycx8p
---
 addons/project/project.py              | 15 ++++++++-------
 addons/project/wizard/task_delegate.py |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 9625db08fc1..9cd0dc65647 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -371,13 +371,14 @@ class task(osv.osv):
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
-            if task.parent_ids and task.parent_ids.state in ('pending','draft'):
-                reopen = True
-                for child in task.parent_ids.child_ids:
-                    if child.id != task.id and child.state not in ('done','cancelled'):
-                        reopen = False
-                if reopen:
-                    self.do_reopen(cr, uid, [task.parent_ids.id])
+            for parent_id in task.parent_ids:
+                if parent_id.state in ('pending','draft'):
+                    reopen = True
+                    for child in parent_id.child_ids:
+                        if child.id != task.id and child.state not in ('done','cancelled'):
+                            reopen = False
+                    if reopen:
+                        self.do_reopen(cr, uid, [parent_id.id])
         return True
 
     def do_reopen(self, cr, uid, ids, *args):
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 35fe2019ea6..7716b90929c 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -52,12 +52,12 @@ class wizard_delegate(wizard.interface):
         task_obj = pooler.get_pool(cr.dbname).get('project.task')
         task = task_obj.browse(cr, uid, data['id'], context)
         newname = data['form']['prefix'] or ''
-        task_obj.copy(cr, uid, data['id'], {
+        new_task_id = task_obj.copy(cr, uid, data['id'], {
             'name': data['form']['name'],
             'user_id': data['form']['user_id'],
             'planned_hours': data['form']['planned_hours'],
             'remaining_hours': data['form']['planned_hours'],
-            'parent_id': data['id'],
+            'parent_ids': [(6, 0, [data['id']])],
             'state': 'open',
             'description': data['form']['new_task_description'] or '',
             'child_ids': [],
@@ -65,7 +65,8 @@ class wizard_delegate(wizard.interface):
         })
         task_obj.write(cr, uid, [data['id']], {
             'remaining_hours': data['form']['planned_hours_me'],
-            'name': newname
+            'name': newname,
+            'child_ids': [(6, 0, [new_task_id])]
         })
         if data['form']['state']=='pending':
             task_obj.do_pending(cr, uid, [data['id']])

From b183ca84b9b53bb13a7cca35ac7063f836aac4c4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:54:32 +0530
Subject: [PATCH 12/21] [IMP] crm: lead list view

bzr revid: hmo@tinyerp.com-20100208072432-7x484pqg86qn4yyt
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ede549d7c9f..b865bb5a1d0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -123,7 +123,7 @@
             <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">                
                 <field name="partner_name" string="Lead Name"/>
                 <field name="stage_id" string="Status"/>
-                <field name="create_date"/>
+                <field name="date" string="Create Date"/>
                 <field name="categ_id" string="Lead Source"/>
                 <field name="email_from" string="Email"/>
                 <field name="user_id"/>

From 4a02735efcf5a7cda425daaabeaeb0aeb01bc9e6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 14:14:04 +0530
Subject: [PATCH 13/21] [IMP]: crm: Improvement in views

bzr revid: rpa@openerp.co.in-20100208084404-xsxa7zo5cslmflx5
---
 addons/crm/crm_claims_view.xml      |  63 ++++++++++-------
 addons/crm/crm_fund_view.xml        |  33 +++++----
 addons/crm/crm_helpdesk_view.xml    |   5 +-
 addons/crm/crm_lead_view.xml        |  18 ++---
 addons/crm/crm_meeting_view.xml     |   6 +-
 addons/crm/crm_opportunity_view.xml |   4 +-
 addons/crm/crm_phonecall_view.xml   | 105 +++++++++++++++-------------
 addons/crm/crm_view.xml             |   4 +-
 8 files changed, 135 insertions(+), 103 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 86387ec015d..fecf8ae8ee3 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -50,37 +50,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="6">
+                <group colspan="4" col="4">
                     <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Responsible" select="2"/>
-                    <newline/>
-                    <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
-                    <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
+                    <field name="planned_cost" string="Claim Cost"/>
                 </group>
+                <group colspan="4" col="4">
                 <notebook>
                 <page string="Claims Info">
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="planned_cost" string="Claim Cost"/>
-                    <field name="probability"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <field name="type_id" string="Type of Action" select="1"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+                		<field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+	                    <field name="partner_address_id" string="Contact"
+	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+	                    <field name="partner_phone"/>
+	                    <field name="partner_mobile"/>
+	                    <field name="email_from"/>
+	                </group>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" string="Responsible" select="2"/>
+                    	<field name="section_id" widget="selection"/>
+                    	<field name="probability"/>
+                    	<label string="Stage: " align="1.0"/>
+                    	<group colspan="1" col="2">
+	                        <field name="stage_id" select="1" nolabel="1"/>
+	                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+	                    </group>
+                    	<field name="categ_id" select="1" widget="selection"
+                    		on_change="onchange_categ_id(categ_id)"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="type_id" string="Type of Action" select="1"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="priority"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <group colspan="4" col="4">
+	                    <field name="ref"/>
+	                    <field name="ref2"/>
+                    </group>
                     <separator colspan="4" string="Claim/Action Description"/>
                     <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="Status"/>
+                    <separator colspan="4" string=""/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -90,7 +102,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="canal_id"/>
@@ -139,6 +151,7 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 077b45af6ff..b172add3df0 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -60,25 +60,32 @@
         <field name="arch" type="xml">
             <form string="Funds Form">
                 <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="2"/>
+                    <field name="name" select="1" string="Name" colspan="4"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <newline/>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration"/>
-                    <field name="type_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" string="Payment Mode" select="1" widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <newline/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="user_id" select="2" string="Responsible"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+	                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+	                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+	                    <field name="email_from" colspan="2"/>
+                    </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" select="2" string="Responsible"/>
+                    	<field name="categ_id" select="1"
+                    		on_change="onchange_categ_id(categ_id)"  widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                    	<field name="date"/>
+	                    <field name="duration"/>
+                    </group>
                     <separator colspan="4" string="Description Information"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
@@ -92,7 +99,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="priority" string="Priority"/>
@@ -119,7 +126,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 71274822f9c..6773bb160c6 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -35,6 +35,7 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
+                    	<separator colspan="4" string="Communication"/>
                         <group col="8" colspan="4">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
                             <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
@@ -58,7 +59,7 @@
                             <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="History">
+                    <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
                         <field name="active" select="2"/>
                         <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
@@ -86,7 +87,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Emails">
+                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b865bb5a1d0..a8e8c2cd3bb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <group colspan="4" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>                                                                        
+                        <separator colspan="4" string="Communication"/>
                         <field name="partner_id" string="Partner"
                         	on_change="onchange_partner_id(partner_id)" />
                         <field name="partner_address_id"
@@ -58,17 +58,17 @@
                         <group colspan="4" col="6">
                             <field name="user_id" select="2"/>                                                        
                             <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>                                
-                            <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                       
+                            <field name="categ_id" select="1"
+                            	on_change="onchange_categ_id(categ_id)"
+                            	string="Lead Source" widget="selection"
+                            	domain="[('object_id.model', '=', 'crm.opportunity')]" />
                             <field name="type_id" string="Campaign" select="1"/>
                             <field name="section_id" colspan="1" widget="selection"/>
                             <field name="priority" string="Priority"/>
-            
                             <field name="date" string="Create Date"/>
 	                    </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
-
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="2"/>
@@ -105,13 +105,13 @@
                                 <field name="date"/>
                             </tree>
                         </field>
-                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                        <button colspan="4" string="Send New Email"
+                        	name="%(crm.wizard_crm_new_send_mail)d"
+                        	context="{'mail':'new'}" icon="gtk-go-forward"
+                        	type="action" />
                      </page>
                     </notebook>
                     </group>
-
-                
-
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 07bdd9438cd..08f55ade474 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -115,8 +115,8 @@
             <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
-                <field name="date" string="Next Meeting"/>
-                <field name="section_id" widget="selection"/>
+                <field name="date" string="Meeting Date"/>
+                <field name="section_id" />
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
@@ -162,7 +162,7 @@
             	<search string="Search Meetings">
                		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
+	               		<filter icon="terp-crm" string="Current" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5cb39d37119..4916fbe174a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -91,7 +91,7 @@
                     </group>
                 </page>
 
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="active"/>
                     <field name="canal_id"/>
                     <field name="som"/>
@@ -116,7 +116,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f64cf5fda54..9ae2533c85c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -77,53 +77,64 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
-                <group colspan="4" col="4">
-                    <field name="name" string="Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <field name="date" string="Planned Date"/>
-                    <field name="duration"/>
-                    <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
-                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
-                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
-	                          'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-					<newline/>
-					<group col="5" colspan="4">
-						<label string="" colspan="2"/>
-						<button string="Schedule a Meeting"
-	                        name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
-	                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                	</group>
-                <notebook colspan="4">
-                <page string="General">
-                    <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1" readonly="1"/>
-                    <field name="active" string="Reminder"/>
-                    <group colspan="2" col="3">
-                        <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />
-                    </group>
-                    <field name="partner_address_id" string="Contact"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="som"/>
-                    <field name="priority" string="Relevant"/>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-               </notebook>
-               </group>
-           </form>
+        	<form string="Phone Call">
+        		<group colspan="4" col="4">
+        			<field name="name" string="Subject" />
+        			<field name="date" string="Planned Date" />
+        			<field name="partner_phone" />
+        			<field name="duration" />
+        			<newline />
+        			<group col="7" colspan="4">
+        				<label string="" colspan="2" />
+        				<button string="Schedule a Meeting"
+        					name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo"
+        					type="action" />
+        				<button string="Convert to Opportunity"
+        					name="%(wizard_crm_phonecall_opportunity_set)d"
+        					icon="gtk-index" type="action"
+        					attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+        				<button string="Convert to Partner"
+        					icon="terp-crm"
+        					name="%(wizard_crm_phonecall_partner_create)d"
+        					type="action"
+        					attrs="{'invisible':[('partner_id','!=',False)]}" />
+        			</group>
+        			<group colspan="4" col="4">
+        				<notebook colspan="4">
+        					<page string="General">
+        						<separator colspan="4" string="Communication" />
+        						<field name="partner_id" />
+        						<field name="partner_address_id" string="Contact" />
+        						<field name="partner_mobile" />
+        						<separator colspan="4" string="Status and Categarization" />
+        						<group colspan="4" col="6">
+	        						<field name="user_id" string="Assigned to" select="2" />
+	        						<field name="section_id" colspan="1" widget="selection" />
+	        						<field name="opportunity_id"
+	        							on_change="onchange_case_id(case_id, name, partner_id)"
+	        							context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                           					'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+	                          				'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}" />
+	        						<field name="som" />
+	        						<field name="priority" />
+	        						<field name="active" string="Reminder" />
+	        					</group>
+	        					<separator string="Description" colspan="4" />
+	        					<field name="description" nolabel="1" colspan="4" />
+        						<separator colspan="4" />
+        						<group col="8" colspan="4">
+        							<field name="state" select="1" />
+        							<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+			                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+			                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+			                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+			                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+        						</group>
+        					</page>
+        				</notebook>
+        			</group>
+        		</group>
+        	</form>
         </field>
     </record>
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fe29f3125d8..9996ed372ad 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -372,7 +372,7 @@
                                 <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="History">
+                        <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
                             <separator colspan="4" string="Dates"/>
@@ -390,7 +390,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Emails">
+                        <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>

From a783606193b715ba65442f738703d3f0b03cb166 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:35:03 +0530
Subject: [PATCH 14/21] [IMP] caldav: invite attendee with delegration

bzr revid: hmo@tinyerp.com-20100208090503-hct2lgekj5cofunm
---
 addons/caldav/caldav.py         | 253 +++++++++++++++++---------------
 addons/caldav/caldav_view.xml   |   6 +-
 addons/crm/crm_meeting_view.xml |   2 +-
 3 files changed, 141 insertions(+), 120 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index d440902f9e2..96c2179dc50 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -172,6 +172,96 @@ html_invitation = """
 </html>
 """
 
+class invite_attendee_wizard(osv.osv_memory):
+    _name = "caldav.invite.attendee"
+    _description = "Invite Attendees"
+
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+              }
+
+    
+
+    def do_invite(self, cr, uid, ids, context={}):            
+        datas = self.read(cr, uid, ids)[0]
+        model = False
+        model_field = False
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        model_field = context.get('attendee_field', False)
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+        type = datas.get('type')
+        att_obj = self.pool.get('calendar.attendee')
+        vals = {}
+        mail_to = []
+        if not model == 'calendar.attendee':
+            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
+
+        if type == 'internal':
+            user_obj = self.pool.get('res.users')
+            for user_id in datas.get('user_ids', []):
+                user = user_obj.browse(cr, uid, user_id)
+                if not user.address_id.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("User does not have an email Address"))
+                vals.update({'user_id': user_id, 
+                                     'email': user.address_id.email})
+                mail_to.append(user.address_id.email)
+                
+        elif  type == 'external' and datas.get('email'):
+            vals.update({'email': datas['email']})
+            mail_to.append(datas['email'])
+        elif  type == 'partner':
+            add_obj = self.pool.get('res.partner.address')
+            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                if not contact.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("Partner does not have an email Address"))
+                vals.update({
+                             'partner_address_id': contact.id, 
+                             'email': contact.email})
+                mail_to.append(contact.email)
+
+        if model == 'calendar.attendee':
+            att = att_obj.browse(cr, uid, context['active_id'])
+            vals.update({
+                'parent_ids' : [(4, att.id)],
+                'ref': att.ref
+            })
+        att_id = att_obj.create(cr, uid, vals)
+        if model_field:
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
+
+        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+                
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        if not contacts:
+            raise osv.except_osv(_('Error!'), \
+                                ("Partner does not have any Contacts"))
+
+        return {'value': {'contact_ids': contacts}}
+
+invite_attendee_wizard()
+
 class calendar_attendee(osv.osv):
     _name = 'calendar.attendee'
     _description = 'Attendee information'
@@ -206,10 +296,14 @@ class calendar_attendee(osv.osv):
                 else:
                     result[id][name] = self._get_address(None, attdata.email)
             if name == 'delegated_to':
-                todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids)
+                todata = []
+                for parent in attdata.parent_ids:
+                    todata.append('MAILTO:' + parent.email)
                 result[id][name] = ', '.join(todata)
             if name == 'delegated_from':
-                fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids)
+                fromdata = []
+                for child in attdata.child_ids:
+                    fromdata.append('MAILTO:' + child.email)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
@@ -277,13 +371,11 @@ class calendar_attendee(osv.osv):
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"), 
-        'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel', 
-                                  'attendee_id', 'user_id', 'Users'), 
+request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
-        'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \
-                                      'attendee_id', 'user_id', 'Users'), 
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -326,6 +418,43 @@ request was delegated to"),
                 self.write(cr, uid, ids, {'state': status})
         return True
 
+    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
+        for att in self.browse(cr, uid, ids, context=context):
+            sign = att.sent_by_uid and att.sent_by_uid.signature or ''
+            sign = '<br>'.join(sign and sign.split('\n') or [])
+            model, res_id = tuple(att.ref.split(','))            
+            res_obj = self.pool.get(model).browse(cr, uid, res_id)
+            if res_obj and len(res_obj):
+                res_obj = res_obj[0]
+            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            att_infos = []
+            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
+            for att2 in self.browse(cr, uid, other_invitaion_ids):
+                att_infos.append(((att2.user_id and att2.user_id.name) or \
+                             (att2.partner_id and att2.partner_id.name) or \
+                                att2.email) +  ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or None, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
+            }
+            body = html_invitation % body_vals
+            if mail_to and email_from:
+                tools.email_send(
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    ) 
+            return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         if not user_id:
             return {'value': {'email': ''}}
@@ -1140,112 +1269,4 @@ class res_users(osv.osv):
                     string='Free/Busy', method=True), 
     }
 res_users()
-
-class invite_attendee_wizard(osv.osv_memory):
-    _name = "caldav.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-              }
-
-    def do_invite(self, cr, uid, ids, context={}):
-        model2field = {
-                       'calendar.attendee': 'del_to_user_ids', 
-                       'crm.meeting': 'attendee_ids'}
-        datas = self.read(cr, uid, ids)[0]
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-        type = datas.get('type')
-        att_obj = self.pool.get('calendar.attendee')
-        vals = {}
-        if not model == 'calendar.attendee':
-            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
-        if type == 'internal':
-            user_obj = self.pool.get('res.users')
-            for user_id in datas.get('user_ids', []):
-                user = user_obj.browse(cr, uid, user_id)
-                if not user.address_id.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("User does not have an email Address"))
-                vals.update({'user_id': user_id, 
-                                     'email': user.address_id.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-
-        elif  type == 'external' and datas.get('email'):
-            vals.update({'email': datas['email']})
-            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-            att_infos = []
-            for att in res_obj.attendee_ids:
-                att_infos.append(((att.user_id and att.user_id.name) or \
-                             (att.partner_id and att.partner_id.name) or \
-                                att.email) +  ' - Status: ' + att.state.title())
-            att_id = att_obj.create(cr, uid, vals)
-            obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-            sign = res_obj.user_id and res_obj.user_id.signature or ''
-            sign = '<br>'.join(sign and sign.split('\n') or [])
-            sub = '[%s Invitation][%d] %s'  % (company, att_id, res_obj.name)
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or None, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
-                        'company': company
-            }
-            body = html_invitation % body_vals
-            mail_to = [datas['email']]
-            tools.email_send(
-                    tools.config.get('email_from', False), 
-                    mail_to, 
-                    sub, 
-                    body, 
-                    subtype='html', 
-                    reply_to=tools.config.get('email_from', False)
-                )
-
-        elif  type == 'partner':
-            add_obj = self.pool.get('res.partner.address')
-            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                if not contact.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("Partner does not have an email Address"))
-                vals.update({
-                             'partner_address_id': contact.id, 
-                             'email': contact.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-        return {}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        if not contacts:
-            raise osv.except_osv(_('Error!'), \
-                                ("Partner does not have any Contacts"))
-
-        return {'value': {'contact_ids': contacts}}
-
-invite_attendee_wizard()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2d3a59892c7..a21d6a0366b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -85,10 +85,10 @@
             			</page>
             			<page string="Delegation Info">
             				<separator string="Delegated to" colspan="4" />
-            				<field name="del_to_user_ids" nolabel="1"
+            				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
             				<separator string="Delegated from" colspan="4" />
-            				<field name="del_from_user_ids" nolabel="1"
+            				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
@@ -105,7 +105,7 @@
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
 	                        	icon="gtk-sort-descending"
-	                        	context="{'model' : 'calendar.attendee', 'state' : 'delegated'}" />
+	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 08f55ade474..76e462cffc7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -58,7 +58,7 @@
             			<button string="Invite People"
             				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
-            				context="{'model' : 'crm.meeting'}" colspan="2"/>
+            				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
             			<field name="attendee_ids" colspan="4"
             				nolabel="1" widget="one2many" mode="tree,form">
             				<tree string="Atendee details" editable="top">

From 1a823ab32da5763a5df3467de16dcabb72aa1fa2 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:51:58 +0530
Subject: [PATCH 15/21] [IMP] crm: fundrising and helpdisk support view

bzr revid: hmo@tinyerp.com-20100208092158-1pfuuevh6olss9tx
---
 addons/crm/crm_fund_view.xml     | 10 +++++-----
 addons/crm/crm_helpdesk_view.xml | 27 +++++++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index b172add3df0..7260ed1e513 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -59,9 +59,8 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Funds Form">
-                <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="4"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
+                <group colspan="4" col="4">
+                    <field name="name" select="1" string="Name"/>                    
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
@@ -77,16 +76,17 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <separator colspan="4" string="Status and Categarization"/>
+                    <separator colspan="4" string="Categarization"/>
                     <group colspan="4" col="6">
                     	<field name="user_id" select="2" string="Responsible"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
                     	<field name="categ_id" select="1"
                     		on_change="onchange_categ_id(categ_id)"  widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                     	<field name="date"/>
 	                    <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Description Information"/>
+                    <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 6773bb160c6..9c9045c5f87 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -25,28 +25,31 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Helpdesk Support">
-                <group colspan="4" col="7">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="section_id" widget="selection"/>
-					<newline/>
+                <group colspan="4" col="4">
+                    <field colspan="4" name="name" select="1"/>                    					
                     <field name="date" select="1"/>
-                    <field name="date_deadline" select="2"/>
-                    <field name="priority"/>
+                    <field name="date_deadline" select="2"/>                    
                 </group>
                 <notebook colspan="4">
                     <page string="General">
                     	<separator colspan="4" string="Communication"/>
-                        <group col="8" colspan="4">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                            <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                            <newline/>
-                            <field colspan="3" name="email_from" select="2"/>
+                        <group col="7" colspan="4">
+                            <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+                            <field  name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+                            
+                            <field  name="email_from" select="2"/>
                             <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            
+                        </group>
+                        <separator colspan="4" string="Categarization"/>
+                        <group col="7" colspan="4">
+                            <field name="priority"/>
+                            <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
                             <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
                         </group>
 
-                        <separator colspan="4" string="Description"/>
+                        <separator colspan="4" string="Details"/>
                         <field name="description" colspan="4" nolabel="1"/>
                         <separator colspan="4"/>
                         <group col="8" colspan="4">

From 9165d7aa7029eb6b10e2871902841d27b9d981c5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 15:05:14 +0530
Subject: [PATCH 16/21] [IMP] mail_gate: improve view of mail_gate history

bzr revid: hmo@tinyerp.com-20100208093514-r7zajo46by9qfksj
---
 addons/mail_gateway/mail_gateway.py       | 1 +
 addons/mail_gateway/mail_gateway_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 314168c4b03..c047c3840b4 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -388,6 +388,7 @@ class mail_gateway_history(osv.osv):
         'name': fields.char('Message Id', size=64, help="Message Id in Email Server."),
         'res_id': fields.integer("Resource ID"),        
         'gateway_id': fields.many2one('mail.gateway',"Mail Gateway", required=True),
+        'model_id':fields.related('gateway_id', 'object_id', type='many2one', relation='ir.model', string='Model'), 
         'note': fields.text('Notes'),
     }
     _order = 'id desc'
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 465eea92b44..fa4f1146311 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,6 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Gateway History">
                     <field name="name"/>
+                    <field name="gateway_id"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <separator string="Note" colspan="4"/>
                     <field name="note" nolabel="1" colspan="4"/>
@@ -22,6 +24,7 @@
             <field name="arch" type="xml">
                 <tree string="Gateway History">
                     <field name="name" select="1"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <field name="gateway_id"/>
                 </tree>

From e6213959fa6f143c0192061fd50423a2a640de2c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 15:27:04 +0530
Subject: [PATCH 17/21] [IMP]: caldav: Improvement in Invite Attendee

bzr revid: rpa@openerp.co.in-20100208095704-zvgmjs8pnkw6zyix
---
 addons/caldav/caldav.py       | 19 +++++++++++--------
 addons/caldav/caldav_view.xml | 13 +++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 96c2179dc50..05e108cf4e5 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -186,10 +186,10 @@ class invite_attendee_wizard(osv.osv_memory):
         'email': fields.char('Email', size=124), 
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
                                   'invite_id', 'contact_id', 'Contacts'), 
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
+ to send an Email to Invited Person')
               }
 
-    
-
     def do_invite(self, cr, uid, ids, context={}):            
         datas = self.read(cr, uid, ids)[0]
         model = False
@@ -241,9 +241,12 @@ class invite_attendee_wizard(osv.osv_memory):
             })
         att_id = att_obj.create(cr, uid, vals)
         if model_field:
-            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
-
-        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)], 
+                                            'state': 'delegated'})
+        
+        if datas.get('send_mail'):
+            att_obj._send_mail(cr, uid, [att_id], mail_to, \
+                   email_from=tools.config.get('email_from', False))
                 
         return {}
 
@@ -374,8 +377,8 @@ class calendar_attendee(osv.osv):
 request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
             'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -394,7 +397,7 @@ request was delegated to"),
         'state':  lambda *x: 'needs-action', 
     }
     
-    response_re = response_re = re.compile("Are you coming\?.*(YES|NO|MAYBE).*", re.UNICODE)
+    response_re = response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
     
     def msg_new(self, cr, uid, msg):        
         return False
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index a21d6a0366b..32038d3e3ee 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Invite People">
                 	<field name="type" />
+                	<field name="send_mail" />
                 	<newline/>
                 	<group col="1" colspan="4"
                 		attrs="{'invisible': [('type', '!=', 'external')]}">
@@ -84,27 +85,27 @@
             				<field name="ref" colspan="4" readonly="1"/>
             			</page>
             			<page string="Delegation Info">
-            				<separator string="Delegated to" colspan="4" />
+            				<separator string="Delegated From" colspan="4" />
             				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
-            				<separator string="Delegated from" colspan="4" />
+            				<separator string="Delegated To" colspan="4" />
             				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
             		<group col="6" colspan="4">
 	                        <field name="state" select="2" />
-	                        <button name="do_tentative"
+	                        <button name="do_tentative" states="needs-action,declined,accepted"
 	                        	string="Uncertain" type="object"
 	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept"
+	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
 	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"
+	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
 	                        	type="object" icon="gtk-cancel" />
 	                        <button
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending"
+	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
 	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>

From e2203a41c0dc0a9563643ed0432ccd54f7912a30 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 15:34:34 +0530
Subject: [PATCH 18/21] [IMP]:survey:Improved.(small changes).

bzr revid: apa@tinyerp.com-20100208100434-lwxit6u5h1gihmm2
---
 addons/survey/report/survey_browse_response.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 7192a6faeb3..986fb0ccb2f 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -158,7 +158,7 @@ class survey_browse_response(report_rml):
                               <para style="terp_tblheader_General_Centre">Response Create Date </para>
                             </td>
                             <td>
-                              <para style="terp_tblheader_General_Centre">Respose By </para>
+                              <para style="terp_tblheader_General_Centre">Response By </para>
                             </td>
                             <td>
                               <para style="terp_tblheader_General_Centre">Status</para>
@@ -243,17 +243,17 @@ class survey_browse_response(report_rml):
                                 ans_list = []
                                 for ans in answer[0].response_answer_ids:
                                     ans_list.append(to_xml(tools.ustr(ans.answer_id.answer)))
-                        
+
                                 answer_choice=[]
                                 _divide_columns_for_matrix = 20
                                 _display_ans_in_rows = 5
                                 _tbl_widths = 500
                                 for ans in que['answer_choice_ids']:
                                     answer_choice.append(to_xml(tools.ustr((ans.answer))))
-        
+
                                 def divide_list(lst, n):
                                     return [lst[i::n] for i in range(n)]
-        
+
                                 divide_list = divide_list(answer_choice,_display_ans_in_rows)
                                 for lst in divide_list:
                                     if que.type == 'multiple_choice_multiple_ans':

From 6012e8fb7051dc5465bf7019e491d6fd31b7353e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 15:38:53 +0530
Subject: [PATCH 19/21] [IMP] sale: change the name of filter string in serach
 view

bzr revid: sbh@tinyerp.com-20100208100853-2adsv054n1sp2aso
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9eee62b95d7..272117a132b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
+						<filter string="By Customer" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -414,7 +414,7 @@
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
 						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="By Scheduled" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        
                         
                     </group>

From 10be0d9f33c6a09169b741a437b20b523dcfa721 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 16:00:26 +0530
Subject: [PATCH 20/21] [Fix] sale_crm: change the name of model_id

bzr revid: sbh@tinyerp.com-20100208103026-8f8268mr7b6qcv45
---
 addons/sale_crm/process/sale_crm_process.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index e3a81b3cd7e..1b469b32d46 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -30,7 +30,7 @@
 
         <record id="process_node_contractanalytic0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
-            <field name="model_id" ref="account.model_account_analytic_account"/>
+            <field name="model_id" ref="analytic.model_account_analytic_account"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>

From 94b515475e1ffe9db0af3b395b0c801b45982bf7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 16:06:04 +0530
Subject: [PATCH 21/21] [IMP] crm: meeting view

bzr revid: hmo@tinyerp.com-20100208103604-f64f42x8ut4madbt
---
 addons/crm/crm_meeting_view.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 76e462cffc7..7df73a7210b 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,19 +24,17 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings Form">
-            	<group col="4" colspan="6">
-            		<field name="name" select="1" string="Summary"
-            			colspan="3" />
-            		<field name="section_id" widget="selection"
-            			colspan="1" />
-            	</group>
-            	<group col="6" colspan="6">
+            <form string="Meetings Form">            	
+            	<group col="6" colspan="4">
+                    <field name="name" select="1" string="Summary"
+            			colspan="4" />
+                    <field name="location" />
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
-            		<field name="location" />
+            		
             		<field name="categ_id"/>
+                    <field name="alarm_id" string="Reminder" widget="selection" />
             		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
                             <field name="rrule_type" string="Recurrency"
                             	on_change="onchange_rrule_type(rrule_type)"
@@ -87,10 +85,11 @@
             		</page>
             		<page string="Other Information">
             			<field name="priority"/>
-            			<field name="show_as"/>
-            			<field name="alarm_id" string="Reminder" widget="selection" />
+            			<field name="show_as"/>            			
             			<field name="class"/>
             			<field name="user_id"/>
+                        <field name="section_id" widget="selection"
+            			/>
             			<field name="vtimezone"/>
             			<field name="recurrent_id" invisible="1" />
             			<field name="recurrent_uid" invisible="1" />