[MERGE] merged from trunk-dev-addons2

bzr revid: hmo@tinyerp.com-20100927140436-ywejvgzc4kfchzwf

4 files changed, 42 insertions, 46 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index 274263682a6..da3fef05f66 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -28,7 +28,6 @@ from itertools import groupby
 from tools.misc import flatten
 from tools.translate import _
 from osv import fields, osv
-from tools import email_send as email
 
 
 class project_task_type(osv.osv):
@@ -245,7 +244,6 @@ class project(osv.osv):
         if context is None:
             context = {}
 
-        task_obj = self.pool.get('project.task')
         proj = self.browse(cr, uid, id, context=context)
         default = default or {}
         context['active_test'] = False
@@ -261,7 +259,6 @@ class project(osv.osv):
             context = {}
         project_obj = self.pool.get('project.project')
         data_obj = self.pool.get('ir.model.data')
-        task_obj = self.pool.get('project.task')
         result = []
         for proj in self.browse(cr, uid, ids, context=context):
             parent_id = context.get('parent_id', False)
@@ -279,8 +276,7 @@ class project(osv.osv):
                                     'date':new_date_end,
                                     'parent_id':parent_id}, context=context)
             result.append(new_id)
-            cr.execute('select id from project_task where project_id=%s', (proj.id,))
-            res = cr.fetchall()
+
             child_ids = self.search(cr, uid, [('parent_id','=', proj.analytic_account_id.id)], context=context)
             parent_id = self.read(cr, uid, new_id, ['analytic_account_id'])['analytic_account_id'][0]
             if child_ids:
@@ -320,7 +316,7 @@ class project(osv.osv):
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
-
+    
 project()
 
 class users(osv.osv):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f8fe814e218..e1b64ccbf1b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -59,7 +59,13 @@
                             </group>
                         </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1"/>
+                            <field colspan="4" name="members" nolabel="1">
+                                <tree string="Members">
+                                    <field name="name"/>
+                                    <field name="user_email"/>
+                                    <field name="address_id"/>
+                                </tree>
+                            </field>
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 78ffa5a8338..7091f466e2c 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -19,11 +19,9 @@
 #
 ##############################################################################
 
-import time
-
 from osv import fields, osv
+import tools
 from tools.translate import _
-from tools import email_send as email
 
 class project_task_close(osv.osv_memory):
     """
@@ -47,7 +45,6 @@ class project_task_close(osv.osv_memory):
             context = {}
         record_id = context and context.get('active_id', False) or False
         task_pool = self.pool.get('project.task')
-        project_pool = self.pool.get('project.project')
                 
         res = super(project_task_close, self).default_get(cr, uid, fields, context=context)
         task = task_pool.browse(cr, uid, record_id, context=context)
@@ -77,41 +74,41 @@ class project_task_close(osv.osv_memory):
             return {}
         task = task_pool.browse(cr, uid, task_id, context=context)
         for data in self.browse(cr, uid, ids, context=context):
-            if res:
-                # Send Warn Message by Email to Manager and Customer
-                if data.manager_warn and not data.manager_email:
-                    raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager."))
+            # Send Warn Message by Email to Manager and Customer
+            if data.manager_warn and not data.manager_email:
+                raise osv.except_osv(_('Error'), _("Please specify the email address of Project Manager."))
 
-                elif data.partner_warn and not data.partner_email:
-                    raise osv.except_osv(_('Error'), _("Please specify the email address of Customer."))
+            elif data.partner_warn and not data.partner_email:
+                raise osv.except_osv(_('Error'), _("Please specify the email address of Customer."))
 
-                elif data.manager_warn or data.partner_warn:
-                    project = task.project_id
-                    subject = _("Task '%s' Closed") % task.name
-                    if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
-                        from_adr = task.user_id.address_id.email
-                        signature = task.user_id.signature
-                    else:
-                        raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
-                    val = {
-                            'name': task.name,
-                            'user_id': task.user_id.name,
-                            'task_id': "%d/%d" % (project.id, task.id),
-                            'date_start': task.date_start,
-                            'date_end': task.date_end,
-                            'state': task.state
-                    }
+            elif data.manager_warn or data.partner_warn:
+                project = task.project_id
+                subject = _("Task '%s' Closed") % task.name
+                if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
+                    from_adr = task.user_id.address_id.email
+                    signature = task.user_id.signature
+                else:
+                    raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))
+                val = {
+                        'name': task.name,
+                        'user_id': task.user_id.name,
+                        'task_id': "%d/%d" % (project.id, task.id),
+                        'date_start': task.date_start,
+                        'date_end': task.date_end,
+                        'state': task.state
+                }
 
-                    header = (project.warn_header or '') % val
-                    footer = (project.warn_footer or '') % val
-                    body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
-                    if data.manager_warn and data.manager_email:
-                        to_adr.append(data.manager_email)
-                    if data.partner_warn and data.partner_email:
-                        to_adr.append(data.partner_email)
-                    mail_id = email(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr])
-                    if not mail_id:
-                        raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
+                to_adr = []
+                header = (project.warn_header or '') % val
+                footer = (project.warn_footer or '') % val
+                body = u'%s\n%s\n%s\n\n-- \n%s' % (header, task.description, footer, signature)
+                if data.manager_warn and data.manager_email:
+                    to_adr.append(data.manager_email)
+                if data.partner_warn and data.partner_email:
+                    to_adr.append(data.partner_email)
+                mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr])
+                if not mail_id:
+                    raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings"))
         return {}
 
 project_task_close()
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 2430b8a0896..ac160fb6c94 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -48,9 +48,6 @@ class project_task_delegate(osv.osv_memory):
         record_id = context and context.get('active_id', False) or False
         task_pool = self.pool.get('project.task')
         task = task_pool.browse(cr, uid, record_id, context=context)
-        project = task.project_id
-        manager = project.user_id or False
-        partner = task.partner_id or task.project_id.partner_id
 
         if 'name' in fields:
             if task.name.startswith(_('CHECK: ')):