[CLEAN] Project: cleaned subtypes, removed auto following that will be added in mail_thread. Updated track_visility parameter.

bzr revid: tde@openerp.com-20121219163941-w7r4egokx9xiwxvl

2 files changed, 19 insertions, 18 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index b0fe9a4f6db..eaa2a7143d8 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -560,14 +560,15 @@ class task(base_stage, osv.osv):
 
     _track = {
         'state': {
-            'project.mt_project_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'project.mt_project_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
+            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
+            'project.mt_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
+            'project.mt_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
         },
         'stage_id': {
-            'project.mt_project_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'open'],
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
         },
         'kanban_state': {  # kanban state: tracked, but only block subtype
-            'project.mt_project_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
+            'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
         },
     }
 
@@ -1117,10 +1118,6 @@ class task(base_stage, osv.osv):
             result = super(task, self).write(cr, uid, ids, vals, context=context)
         if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
             self._store_history(cr, uid, ids, context=context)
-
-        # subscribe new project followers to the task
-        if vals.get('project_id'):
-            self._subscribe_followers_subtype(cr, uid, ids, vals.get('project_id'), 'project.project', context=context)
         return result
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 49375a36a23..58aa11bc398 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -83,19 +83,23 @@
             <field name="name">Task Created</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
+            <field name="description">Task &lt;b&gt;created&lt;/b&gt;</field>
         </record>
         <record id="mt_task_started" model="mail.message.subtype">
             <field name="name">Task Started</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
+            <field name="description">Task &lt;b&gt;started&lt;/b&gt;</field>
         </record>
         <record id="mt_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
             <field name="res_model">project.task</field>
+            <field name="description">Task &lt;b&gt;blocked&lt;/b&gt;</field>
         </record>
         <record id="mt_task_closed" model="mail.message.subtype">
             <field name="name">Task Done</field>
             <field name="res_model">project.task</field>
+            <field name="description">Task &lt;b&gt;closed&lt;/b&gt;</field>
         </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
@@ -104,36 +108,36 @@
         </record>
         <!-- Project-related subtypes for messaging / Chatter -->
         <record id="mt_project_task_new" model="mail.message.subtype">
-            <field name="name">Task Created</field>
+            <field name="name">PT-Task Created</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_new')"/>
-            <field name="parent_field">project_id</field>
+            <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+            <field name="name">PT-Task Started</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
             <field name="parent_id" eval="ref('mt_task_started')"/>
-            <field name="parent_field">project_id</field>
+            <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
-            <field name="name">Task Blocked</field>
+            <field name="name">PT-Task Blocked</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
-            <field name="parent_field">project_id</field>
+            <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
+            <field name="name">PT-Task Done</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_closed')"/>
-            <field name="parent_field">project_id</field>
+            <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
-            <field name="name">Stage Changed</field>
+            <field name="name">PT-Stage Changed</field>
             <field name="res_model">project.project</field>
             <field name="parent_id" eval="ref('mt_task_stage')"/>
-            <field name="parent_field">project_id</field>
+            <field name="relation_field">project_id</field>
         </record>
 
         <!-- notify all employees of module installation -->