[IMP]analytic: Add members field

bzr revid: dbr@tinyerp.com-20120530103159-n9yw01h99ap56yfw

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">

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.\

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>

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 = {

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" />