[MERGE] res_user rework mostly email from user instead of address

bzr revid: al@openerp.com-20110805210049-4ocau2btlq2jg2tx

3 files changed, 13 insertions, 13 deletions

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 85cde448c6d..731134d0cc6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -63,7 +63,6 @@
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
-                                    <field name="address_id"/>
                                 </tree>
                             </field>
                         </page>
@@ -397,7 +396,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Tasks" icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
@@ -546,9 +545,9 @@
           <field name="inherit_id" ref="base.view_users_form"/>
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
-              <xpath expr="/form/notebook" position="before">
+              <group name="default_filters" position="inside">
                    <field name="context_project_id"/>
-              </xpath>
+              </group>
           </field>
      </record>
 
@@ -559,9 +558,9 @@
          <field name="type">form</field>
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
-            <page string="Current Activity" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
-            </page>
+            <group name="default_filters" position="inside">
+                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
+            </group>
        </field>
     </record>
     <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index b51a5a9c89a..62f74f51d1b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
 
-    <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
-    </record>
-
     <record id="group_project_user" model="res.groups">
         <field name="name">Project / User</field>
     </record>
 
+    <record id="group_project_manager" model="res.groups">
+        <field name="name">Project / Manager</field>
+        <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
+    </record>
+
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py
index 010bba9e52b..627864820f6 100644
--- a/addons/project/wizard/project_task_close.py
+++ b/addons/project/wizard/project_task_close.py
@@ -84,8 +84,8 @@ class project_task_close(osv.osv_memory):
             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
+                if task.user_id  and task.user_id.user_email:
+                    from_adr = task.user_id.user_email
                     signature = task.user_id.signature
                 else:
                     raise osv.except_osv(_('Error'), _("Couldn't send mail because your email address is not configured!"))