From 41161a904c7c7ecb6872759d8c979e8a8a466c66 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 16:01:59 +0530
Subject: [PATCH 1/2] [IMP]analytic: Add members field

bzr revid: dbr@tinyerp.com-20120530103159-n9yw01h99ap56yfw
---
 .../account_analytic_analysis_view.xml                        | 2 +-
 addons/analytic/analytic.py                                   | 2 ++
 addons/analytic/analytic_view.xml                             | 2 ++
 addons/project/project.py                                     | 4 ++--
 addons/project/project_view.xml                               | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 065a0b4009b..c2ad035b2f9 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -56,7 +56,7 @@
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//separator[@name="description"]' position='before'>
+                <xpath expr='//separator[@name="team"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
 		    <group colspan="4">
 			<group col="2" colspan="1" class="oe_form_group_label_border">
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 0ba92cb0289..6cdd0a43490 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -170,6 +170,8 @@ class account_analytic_account(osv.osv):
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+            states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0b909d2c5c0..55a64168767 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -28,6 +28,8 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
+                                <separator string="Team" colspan="4" name="team"/>
+                                <field colspan="4" name="members" nolabel="1"/>
                                 <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
diff --git a/addons/project/project.py b/addons/project/project.py
index 51d254756f4..0dbbfcfd689 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -170,8 +170,8 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'warn_manager': fields.boolean('Notify Manager', help="If you check this field, the project manager will receive an email each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
 
-        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
-            help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        #'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+        #    help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'tasks': fields.one2many('project.task', 'project_id', "Task Activities"),
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29704cf3318..847449be746 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -64,7 +64,7 @@
                             </group>
                         </page>
                         <page string="Members">
-                            <field colspan="4" name="members" nolabel="1">
+                            <field colspan="4" name="members" nolabel="1" help="Project's members are users who can have an access to the tasks related to this project.">
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
@@ -577,6 +577,7 @@
                         <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
+                        <field name="project_id" invisible="1"/>
                         <filter name="project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                         <field name="user_id">
                             <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal" />

From 3b7f1698d9856eba10e46acacd5ab8bb7e0237e7 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Wed, 30 May 2012 18:09:13 +0530
Subject: [PATCH 2/2] [IMP]project: Set members field in proper module

bzr revid: dbr@tinyerp.com-20120530123913-e7u4m3m3u6lgiop6
---
 .../account_analytic_analysis_view.xml                        | 2 +-
 addons/analytic/analytic.py                                   | 2 --
 addons/analytic/analytic_view.xml                             | 4 +---
 addons/project/project.py                                     | 2 ++
 addons/project/project_view.xml                               | 3 +++
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index c2ad035b2f9..065a0b4009b 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -56,7 +56,7 @@
                         <field name="quantity_max"/><label string="/"/> <label string="Remaining"/> <field name="remaining_hours" nolabel="1"/>
                     </group>
                 </xpath>
-                <xpath expr='//separator[@name="team"]' position='before'>
+                <xpath expr='//separator[@name="description"]' position='before'>
 		    <separator colspan="4" string="Invoicing" name="invoicing"/>
 		    <group colspan="4">
 			<group col="2" colspan="1" class="oe_form_group_label_border">
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6cdd0a43490..0ba92cb0289 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -170,8 +170,6 @@ class account_analytic_account(osv.osv):
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
-        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
-            states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','Open'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,
                                   help='* When an account is created its in \'Draft\' state.\
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 55a64168767..af5925829dd 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -20,7 +20,7 @@
                         </group>
                         <notebook colspan="4">
                             <page string="Contract Information" name="contract_page">
-                                <group colspan="2" col="2" name="contract" class="oe_form_group_label_border">
+                                <group colspan="2" col= "2" name="contract" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Validity"/>
                                     <field name="date_start"/>
                                     <field name="date"/>
@@ -28,8 +28,6 @@
                                 <group colspan="2" col="2" name="project" class="oe_form_group_label_border">
                                     <separator colspan="2" string="Project" name="project_sep" invisible="1"/>
                                 </group>
-                                <separator string="Team" colspan="4" name="team"/>
-                                <field colspan="4" name="members" nolabel="1"/>
                                 <separator string="Terms and Condition" colspan="4" name="description"/>
                                 <field colspan="4" name="description" nolabel="1"/>
                             </page>
diff --git a/addons/project/project.py b/addons/project/project.py
index 0dbbfcfd689..3bda5ad128e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -1236,6 +1236,8 @@ class account_analytic_account(osv.osv):
     _columns = {
         'use_tasks': fields.boolean('Tasks Management'),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
+            states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
     }
 #    _defaults = {
 #        'use_tasks': True,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 50eb9075ffc..737a4c01b02 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -621,6 +621,9 @@
                 <xpath expr='//separator[@name="project_sep"]' position='replace'>
                     <separator colspan="2" string="Project" name="project_sep"/>
                 </xpath>
+                <xpath expr='//separator[@name="description"]' position='before'>
+                    <field name="members" colspan="4" nolabel="1"/>
+                </xpath>
             	<xpath expr='//group[@name="project"]' position='inside'>
                     <field name="use_tasks" />
                 </xpath>