Merge lp:~savoirfairelinux-openerp/openerp-mgmtsystem/nc-chatter-v7 into lp:openerp-mgmtsystem

[Sandy Carter (http://www.savoirfairelinux.com)]

Added OpenChatter integration to Audits, Actions, NCs.
Removed old messaging system.
Added automatic follower subscriptions according to blueprint.
Added custom OpenChatter messages where needed, according to blueprint.
Added automatic emails.

Test follower subscriptions with multiple users (including responsible/owners who are not current user).
Test email messages, esp. links that are included.
Test email formats (HTML, plaintext).
Test state changes -> chatter posts.

Nothing was done to Procedures as per discussion with Max.

[lp:~savoirfairelinux-openerp/openerp-mgmtsystem/nc-chatter-v7]

51. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-07

Added object's direct link to emails.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Thanks Sandy. Please have the conflicts fixed to get this MP approved.

review: Needs Fixing

[lp:~savoirfairelinux-openerp/openerp-mgmtsystem/nc-chatter-v7]

52. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-07

Merge: lp:openerp-mgmtsystem

53. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-09-07

[FIX] PEP8 compliance in audit, action and nonconformity

54. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-09-07

[IMP] Bump versions

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (lgtm, no test)

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

LGTM

review: Approve (review, no test)

[Daniel Reis (dreis-pt)]

Well done, great work there Sandy!

There some minor details I think could be improved:

* The text for the chatter notifications could be improved, to be similar to the text used in Project Issues. For example, instead notifications with of just "Analysis" or "Pending Approval", or even " has been opened.", we would have something like:
"""
Stage changed
    • Stage: New → Pending
"""
The "Analysis Approved" and "Action Plan Approved" look fine for me, and could be kept..

* I also suggest for the buttons to change to previous states to be in a different colour (I suggest blue):
  - At "Pending Approval" state, the "Send for Analysis" button
  - At the "In Progress" state, the "Send for Review".
You might have to create additions buttons for the same actions.

Thanks!

review: Needs Fixing

[Daniel Reis (dreis-pt)]

PS: at line 280, is there a reason to add inheritance on crm.claim to Audits? Shouldn't it inherit from mail.thread directly?

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

Thank you for the feedback.

With mail.thread, without crm.claim:
"""
ValidateError

Error occurred while validating the field(s) arch: Invalid XML for View Architecture!
"""
"""
2013-09-09 14:10:48,496 4912 ERROR dev openerp.osv.orm: Can't find field 'user_id' in the following view parts composing the view of object model 'mgmtsystem.audit':
 * mgmtsystem.audit.form

Either you wrongly customized this view, or some modules bringing those views are not compatible with your current data model
"""
I added it to match actions.

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

> """
> Stage changed
> • Stage: New → Pending
> """

I'm pretty sure that:
"""
Stage: New → Settled
"""
is the default message for OpenChatter when states change (see Actions -> close)

[lp:~savoirfairelinux-openerp/openerp-mgmtsystem/nc-chatter-v7]

55. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-09

Improvement to NC chatter state change messages.

56. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-09

Buttons that change state backwards (towards draft) are no longer highlighted.

[Daniel Reis (dreis-pt)]

The messages looks great now Sandy, thanks.

Note that there is still a problem on the message when going from Pending Approval to In Progress:
it displays a cut-out sentence: " has been opened.".
I did further checking on this, and the prefix is provided by case_get_note_msg_prefix() (see base_status/base_stage.py#166). It needs to be overridden to return "Nonconformity".

Regarding Audits and crm.claim, for some strange reason 'user_id' is not defined in mgmtsystem_audit.py!
You can solve this with:
 31 _inherit = ['mail.thread']
 33 _columns = {
 34 'user_id': fields.many2one('res.users', 'Audit Manager'),

review: Needs Fixing

[lp:~savoirfairelinux-openerp/openerp-mgmtsystem/nc-chatter-v7]

57. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-10

Make audit inherit mail.thread instead of crm.claim

58. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-10

Prefix overwriten for Nonconformity

59. By Sandy Carter (http://www.savoirfairelinux.com) on 2013-09-10

Fix to integrity check error

[Daniel Reis (dreis-pt)]

review: Approve

=== modified file 'mgmtsystem_action/__openerp__.py'
--- mgmtsystem_action/__openerp__.py	2013-08-26 03:22:45 +0000
+++ mgmtsystem_action/__openerp__.py	2013-09-10 15:25:36 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 {
-    "name" : "Management System - Action",
-    "version" : "1.1",
-    "author" : "Savoir-faire Linux",
-    "website" : "http://www.savoirfairelinux.com",
-    "license" : "AGPL-3",
-    "category" : "Management System",
+    "name": "Management System - Action",
+    "version": "1.2",
+    "author": "Savoir-faire Linux",
+    "website": "http://www.savoirfairelinux.com",
+    "license": "AGPL-3",
+    "category": "Management System",
     "description": """\
 This module enables you to manage the different actions of your management system:
   * immediate actions
@@ -41,8 +41,7 @@
         'mgmtsystem_action.xml',
         'board_mgmtsystem_action.xml',
     ],
-    "demo" : ['demo_action.xml',],
-    "installable" : True,
+    "demo": ['demo_action.xml'],
+    "installable": True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'mgmtsystem_action/mgmtsystem_action.py'
--- mgmtsystem_action/mgmtsystem_action.py	2013-08-25 14:58:18 +0000
+++ mgmtsystem_action/mgmtsystem_action.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,13 +15,17 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
+from tools.translate import _
+from urllib import urlencode
+from urlparse import urljoin
 from openerp.osv import fields, orm
 from crm import crm
 
+
 class mgmtsystem_action(orm.Model):
     _name = "mgmtsystem.action"
     _description = "Action"
@@ -33,10 +37,6 @@
                                          ('prevention', 'Preventive Action'),
                                          ('improvement', 'Improvement Opportunity')],
                                         'Response Type'),
-        'message_ids': fields.one2many('mail.message',
-                                       'res_id',
-                                       'Messages',
-                                       domain=[('model','=',_name)]),
         'system_id': fields.many2one('mgmtsystem.system', 'System'),
         'company_id': fields.many2one('res.company', 'Company')
         }
@@ -52,4 +52,25 @@
         }, context=context)
         return super(mgmtsystem_action, self).create(cr, uid, vals, context=context)
 
+    def message_auto_subscribe(self, cr, uid, ids, updated_fields, context=None):
+        """Automatically add the responsible user to the follow list."""
+        for o in self.browse(cr, uid, ids, context=context):
+            self.message_subscribe_users(cr, uid, ids, user_ids=[o.user_id.id], subtype_ids=None, context=context)
+        return super(mgmtsystem_action, self).message_auto_subscribe(cr, uid, ids, updated_fields, context=context)
+
+    def case_close(self, cr, uid, ids, context=None):
+        """When Action is closed, post a message on the related NC's chatter"""
+        for o in self.browse(cr, uid, ids, context=context):
+            for nc in o.nonconformity_ids:
+                nc.case_send_note(_('Action "%s" was closed.' % o.name))
+        return super(mgmtsystem_action, self).case_close(cr, uid, ids, context=context)
+
+    def get_action_url(self, cr, uid, ids, context=None):
+        assert len(ids) == 1
+        action = self.browse(cr, uid, ids[0], context=context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
+        query = {'db': cr.dbname}
+        fragment = {'id': action.id, 'model': self._name}
+        return urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_action/mgmtsystem_action.xml'
--- mgmtsystem_action/mgmtsystem_action.xml	2013-08-25 15:20:05 +0000
+++ mgmtsystem_action/mgmtsystem_action.xml	2013-09-10 15:25:36 +0000
@@ -57,40 +57,27 @@
                         <button name="case_close" string="Close" states="draft,open" type="object" icon="gtk-jump-to"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,open,pending,done"/>
                     </header>
-                    <group colspan="4" col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="type_action" required="True"/>
-                        <field name="reference"/>
-                        <field name="user_id" string="Responsible" required="1"/>
-                        <field name="date" string="Date"/>
-                        <field name="date_deadline" string="Deadline"/>
-                        <field name="system_id"/>
-                    	<field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                    <notebook colspan="4">
+                    <sheet string="Action">
+                        <group colspan="4" col="4">
+                            <field name="name" colspan="4"/>
+                            <field name="type_action" required="True"/>
+                            <field name="reference"/>
+                            <field name="user_id" string="Responsible" required="1"/>
+                            <field name="date" string="Date"/>
+                            <field name="date_deadline" string="Deadline"/>
+                            <field name="system_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <notebook colspan="4">
                             <page string="Description">
                                 <field name="description" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="History">
-                                <group colspan="4">
-                                    <field colspan="4" name="email_cc" string="Global CC" widget="char"/>
-                                </group>
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-                                <tree string="History">
-                                        <field name="subject" string="History Information"/>
-                                        <field name="email_from" invisible="1"/>
-                                        <button
-                                            string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                            name="%(mail.action_email_compose_message_wizard)d"
-                                            context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                            icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
-                            </page>
-                    </notebook>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -112,4 +99,41 @@
             groups="mgmtsystem.group_mgmtsystem_manager,mgmtsystem.group_mgmtsystem_auditor,base.group_user"/>
 
     </data>
+
+    <data noupdate="1">
+        <!-- Email template for Action Reminders -->
+        <record id="action_email_reminder_action" model="ir.actions.server">
+            <field name="name">Reminder to Responsible</field>
+            <field name="model_id" ref="model_mgmtsystem_action"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">object.user_id.email</field>
+            <field name="subject">Reminder on Action: "[[object.name]]"</field>
+            <field name="message">
+Hello,
+
+This is an automated message to remind you that the following action is due to be completed in 10 days ([[object.date_deadline]]):
+
+[[object.get_action_url()]]
+
+
+Thank you and have a nice day.
+--
+OpenERP
+            </field>
+        </record>
+
+        <!-- Automated Action: Email reponsible user 10 days before deadline. -->
+        <record id="rule_set_reminder_action" model="base.action.rule">
+            <field name="name">Email Action Reminders 10 days before due date.</field>
+            <field name="model_id" ref="model_mgmtsystem_action"/>
+            <field name="trg_date_id" ref="field_mgmtsystem_action_date_deadline"/>
+            <field name="trg_date_range">-10</field>
+            <field name="trg_date_range_type">day</field>
+            <field name="server_action_ids" eval="[(6, 0, [ref('action_email_reminder_action')])]"/>
+        </record>
+
+    </data>
+
 </openerp>

=== modified file 'mgmtsystem_audit/__init__.py'
--- mgmtsystem_audit/__init__.py	2013-03-04 14:34:30 +0000
+++ mgmtsystem_audit/__init__.py	2013-09-10 15:25:36 +0000
@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-import mgmtsystem_audit
-import report
-import wizard
+from . import mgmtsystem_audit
+from . import report
+from . import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_audit/__openerp__.py'
--- mgmtsystem_audit/__openerp__.py	2013-08-26 03:22:45 +0000
+++ mgmtsystem_audit/__openerp__.py	2013-09-10 15:25:36 +0000
@@ -19,17 +19,17 @@
 #
 ##############################################################################
 {
-    "name" : "Management System - Audit",
-    "version" : "1.1",
-    "author" : "Savoir-faire Linux",
-    "website" : "http://www.savoirfairelinux.com",
-    "license" : "AGPL-3",
-    "category" : "Management System",
+    "name": "Management System - Audit",
+    "version": "1.2",
+    "author": "Savoir-faire Linux",
+    "website": "http://www.savoirfairelinux.com",
+    "license": "AGPL-3",
+    "category": "Management System",
     "description": """\
 This module enables you to manage audits and verifications lists of your management system.
     """,
     "depends": ['mgmtsystem_nonconformity'],
-    "data" : [
+    "data": [
         'security/ir.model.access.csv',
         'security/mgmtsystem_audit_security.xml',
         'audit_sequence.xml',
@@ -39,10 +39,10 @@
         'board_mgmtsystem_audit.xml',
         'wizard/copy_verification_lines.xml',
     ],
-    "demo" : [
+    "demo": [
         'demo_audit.xml',
     ],
-    "installable" : True,
-    "certificate" : ''
+    "installable": True,
+    "certificate": ''
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_audit/demo_audit.xml'
--- mgmtsystem_audit/demo_audit.xml	2012-03-09 23:47:59 +0000
+++ mgmtsystem_audit/demo_audit.xml	2013-09-10 15:25:36 +0000
@@ -7,6 +7,7 @@
             <field name="date">2010-12-03</field>
             <field name="strong_points">* Good documentation</field>
             <field name="to_improve_points">* Procedure respect</field>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="auditor_user_ids" eval="[(6,0,[ref('base.user_demo')])]"/>
             <field name="auditee_user_ids" eval="[(6,0,[ref('base.user_root')])]"/>
             <field name="imp_opp_ids" eval="[(6,0,[ref('mgmtsystem_action.demo_improvement')])]"/>

=== modified file 'mgmtsystem_audit/mgmtsystem_audit.py'
--- mgmtsystem_audit/mgmtsystem_audit.py	2013-08-25 15:20:05 +0000
+++ mgmtsystem_audit/mgmtsystem_audit.py	2013-09-10 15:25:36 +0000
@@ -19,24 +19,29 @@
 #
 ##############################################################################
 
+from tools.translate import _
 from openerp.osv import fields, orm
+from urllib import urlencode
+from urlparse import urljoin
 
 
 class mgmtsystem_audit(orm.Model):
     _name = "mgmtsystem.audit"
     _description = "Audit"
+    _inherit = ['mail.thread']
     _columns = {
         'name': fields.char('Name', size=50),
         'reference': fields.char('Reference', size=64, required=True, readonly=True),
         'date': fields.datetime('Date'),
-        'line_ids': fields.one2many('mgmtsystem.verification.line','audit_id','Verification List'),
-        'auditor_user_ids': fields.many2many('res.users','mgmtsystem_auditor_user_rel','user_id','mgmtsystem_audit_id','Auditors'),
-        'auditee_user_ids': fields.many2many('res.users','mgmtsystem_auditee_user_rel','user_id','mgmtsystem_audit_id','Auditees'),
+        'line_ids': fields.one2many('mgmtsystem.verification.line', 'audit_id', 'Verification List'),
+        'user_id': fields.many2one('res.users', 'Audit Manager'),
+        'auditor_user_ids': fields.many2many('res.users', 'mgmtsystem_auditor_user_rel', 'user_id', 'mgmtsystem_audit_id', 'Auditors'),
+        'auditee_user_ids': fields.many2many('res.users', 'mgmtsystem_auditee_user_rel', 'user_id', 'mgmtsystem_audit_id', 'Auditees'),
         'strong_points': fields.text('Strong Points'),
         'to_improve_points': fields.text('Points To Improve'),
-        'imp_opp_ids': fields.many2many('mgmtsystem.action','mgmtsystem_audit_imp_opp_rel','mgmtsystem_action_id','mgmtsystem_audit_id','Improvement Opportunities'),
+        'imp_opp_ids': fields.many2many('mgmtsystem.action', 'mgmtsystem_audit_imp_opp_rel', 'mgmtsystem_action_id', 'mgmtsystem_audit_id', 'Improvement Opportunities'),
         'nonconformity_ids': fields.many2many('mgmtsystem.nonconformity', string='Nonconformities'),
-        'state': fields.selection([('open','Open'),('done','Closed')], 'State'),
+        'state': fields.selection([('open', 'Open'), ('done', 'Closed')], 'State'),
         'system_id': fields.many2one('mgmtsystem.system', 'System'),
         'company_id': fields.many2one('res.company', 'Company')
         }
@@ -54,14 +59,37 @@
         return super(mgmtsystem_audit, self).create(cr, uid, vals, context)
 
     def button_close(self, cr, uid, ids, context=None):
+        """When Audit is closed, post a message to followers' chatter."""
+        self.message_post(cr, uid, ids, _("Audit closed"), context=context)
         return self.write(cr, uid, ids, {'state': 'done'})
 
+    def message_auto_subscribe(self, cr, uid, ids, updated_fields, context=None):
+        """Automatically add the Auditors, Auditees and Audit Manager to the follow list"""
+        for o in self.browse(cr, uid, ids, context=context):
+            user_ids = [o.user_id.id]
+            user_ids += [a.id for a in o.auditor_user_ids]
+            user_ids += [a.id for a in o.auditee_user_ids]
+            self.message_subscribe_users(cr, uid, ids, user_ids=user_ids, subtype_ids=None, context=context)
+        return super(mgmtsystem_audit, self).message_auto_subscribe(cr, uid, ids, updated_fields, context=context)
+
+    def get_audit_url(self, cr, uid, ids, context=None):
+        """
+        Return a short link to the audit form view
+        eg. http://localhost:8069/?db=prod#id=1&model=mgmtsystem.audit
+        """
+        assert len(ids) == 1
+        audit = self.browse(cr, uid, ids[0], context=context)
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
+        query = {'db': cr.dbname}
+        fragment = {'id': audit.id, 'model': self._name}
+        return urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+
 
 class mgmtsystem_verification_line(orm.Model):
     _name = "mgmtsystem.verification.line"
     _description = "Verification Line"
     _columns = {
-        'name': fields.char('Question',size=300, required=True),
+        'name': fields.char('Question', size=300, required=True),
         'audit_id': fields.many2one('mgmtsystem.audit', 'Audit', ondelete='cascade', select=True),
         'procedure_id': fields.many2one('document.page', 'Procedure', ondelete='cascade', select=True),
         'is_conformed': fields.boolean('Is conformed'),

=== modified file 'mgmtsystem_audit/mgmtsystem_audit.xml'
--- mgmtsystem_audit/mgmtsystem_audit.xml	2013-08-25 15:20:05 +0000
+++ mgmtsystem_audit/mgmtsystem_audit.xml	2013-09-10 15:25:36 +0000
@@ -112,36 +112,43 @@
                         <button name="button_close" string="Close" states="open" type="object" icon="gtk-jump-to"/>
                         <field name="state" widget="statusbar" select="1" readonly="1"/>
                     </header>
-                    <group col="8" colspan="6">
-                        <field name="name" attrs="{'readonly':[('state','=','done')]}"/>
-                        <field name="reference"/>
-                        <field name="date" attrs="{'readonly':[('state','=','done')]}"/>
-                        <field name="system_id"/>
-                    	<field name="company_id" groups="base.group_multi_company"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Auditors">
-                            <field name="auditor_user_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="Auditees">
-                            <field name="auditee_user_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="Verification List">
-                            <field name="line_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="Strong Points">
-                            <field name="strong_points" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="To Improve Points">
-                            <field name="to_improve_points" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="Improvement Opportunities">
-                            <field name="imp_opp_ids" domain="[('type_action','=','improvement')]" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                        <page string="Nonconformities">
-                            <field name="nonconformity_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
-                        </page>
-                    </notebook>
+                    <sheet string="Audit">
+                        <group col="4" colspan="2">
+                            <field name="name" attrs="{'readonly':[('state','=','done')]}"/>
+                            <field name="reference"/>
+                            <field name="date" attrs="{'readonly':[('state','=','done')]}"/>
+                            <field name="user_id" string="Audit Manager" required="1"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                            <field name="system_id"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Auditors">
+                                <field name="auditor_user_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="Auditees">
+                                <field name="auditee_user_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="Verification List">
+                                <field name="line_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="Strong Points">
+                                <field name="strong_points" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="To Improve Points">
+                                <field name="to_improve_points" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="Improvement Opportunities">
+                                <field name="imp_opp_ids" domain="[('type_action','=','improvement')]" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                            <page string="Nonconformities">
+                                <field name="nonconformity_ids" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -193,4 +200,75 @@
         </record>
 
     </data>
+
+    <data noupdate="1">
+        <!-- Email template for "Prepare to audit" message to all auditors. -->
+        <record id="action_email_prepare_to_audit" model="ir.actions.server">
+            <field name="name">Prepare to audit</field>
+            <field name="model_id" ref="model_mgmtsystem_audit"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">",".join(set([ i.email for i in object.auditor_user_ids ]))</field>
+            <field name="subject">Prepare to Audit: "[[object.name]]"</field>
+            <field name="message">
+Hello,
+
+The audit "[[object.name]]" is scheduled in 2 weeks.
+Please prepare the verification list:
+
+[[object.get_audit_url()]]
+
+
+Thank you.
+--
+OpenERP
+            </field>
+        </record>
+        <!-- Automated Action: Email all auditors 2 weeks before Audit. -->
+        <record id="rule_set_prepare_to_audit" model="base.action.rule">
+            <field name="name">Email all auditors 2 weeks before audit.</field>
+            <field name="model_id" ref="model_mgmtsystem_audit"/>
+            <field name="trg_date_id" ref="field_mgmtsystem_audit_date"/>
+            <field name="trg_date_range">14</field>
+            <field name="trg_date_range_type">day</field>
+            <field name="server_action_ids" eval="[(6, 0, [ref('action_email_prepare_to_audit')])]"/>
+        </record>
+    </data>
+
+    <data noupdate="1">
+        <!-- Email template for "Send verification list" message to all followers -->
+        <record id="action_email_send_verification_list" model="ir.actions.server">
+            <field name="name">Send Verification List</field>
+            <field name="model_id" ref="model_mgmtsystem_audit"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">",".join(set([i.email for i in object.auditor_user_ids] + [i.email for i in object.auditee_user_ids] + [object.user_id.email]))</field>
+            <field name="subject">Send Verification List: "[[object.name]]"</field>
+            <field name="message">
+Hello,
+
+The audit "[[object.name]]" is scheduled in 1 week.
+Please finish the verification list and send it to the auditees:
+
+[[object.get_audit_url()]]
+
+
+Thank you.
+--
+OpenERP
+            </field>
+        </record>
+        <!-- Automated Action: Email all followers 1 weeks before Audit. -->
+        <record id="rule_set_send_verification_list" model="base.action.rule">
+            <field name="name">Email all followers 1 week before audit.</field>
+            <field name="model_id" ref="model_mgmtsystem_audit"/>
+            <field name="trg_date_id" ref="field_mgmtsystem_audit_date"/>
+            <field name="trg_date_range">7</field>
+            <field name="trg_date_range_type">day</field>
+            <field name="server_action_ids" eval="[(6, 0, [ref('action_email_send_verification_list')])]"/>
+        </record>
+    </data>
+
 </openerp>

=== modified file 'mgmtsystem_audit/migrations/7.0.1.0/post-migration.py'
--- mgmtsystem_audit/migrations/7.0.1.0/post-migration.py	2013-04-01 19:13:26 +0000
+++ mgmtsystem_audit/migrations/7.0.1.0/post-migration.py	2013-09-10 15:25:36 +0000
@@ -25,6 +25,7 @@
 
 logger = logging.getLogger('upgrade')
 
+
 def migrate(cr, version):
     logger.info("Migrating mgmtsystem_audit from version %s", version)
 

=== modified file 'mgmtsystem_audit/report/__init__.py'
--- mgmtsystem_audit/report/__init__.py	2012-12-17 17:18:12 +0000
+++ mgmtsystem_audit/report/__init__.py	2013-09-10 15:25:36 +0000
@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
-import audit_report
-import verification_list 
+from . import audit_report
+from . import verification_list
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_audit/report/audit_report.py'
--- mgmtsystem_audit/report/audit_report.py	2013-05-29 16:51:38 +0000
+++ mgmtsystem_audit/report/audit_report.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,13 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 from report import report_sxw
 
+
 class mgmtsystem_audit_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(mgmtsystem_audit_report, self).__init__(cr, uid, name, context)

=== modified file 'mgmtsystem_audit/report/verification_list.py'
--- mgmtsystem_audit/report/verification_list.py	2013-05-29 16:51:38 +0000
+++ mgmtsystem_audit/report/verification_list.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,13 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import time
 from report import report_sxw
 
+
 class mgmtsystem_audit_verification_list(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(mgmtsystem_audit_verification_list, self).__init__(cr, uid, name, context)
@@ -32,7 +33,6 @@
         self.context = context
 
     def get_lines_by_procedure(self, verification_lines):
-        v = {}
         p = []
         for l in verification_lines:
             proc_nm = self.pool.get('document.page').read(self.cr, self.uid, l.procedure_id.id, ['name'])
@@ -40,16 +40,13 @@
                       "procedure": proc_nm['name'],
                       "name": l.name,
                       "yes_no": "Yes / No"})
-                    
         p = sorted(p, key=lambda k: k["procedure"])
-
         proc_line = False
         q = []
         proc_name = ''
         for i in range(len(p)):
             if proc_name != p[i]['procedure']:
                 proc_line = True
-                
             if proc_line:
                 q.append({"id": p[i]['id'],
                           "procedure": p[i]['procedure'],
@@ -57,16 +54,12 @@
                           "yes_no": ""})
                 proc_line = False
                 proc_name = p[i]['procedure']
-
             q.append({"id": p[i]['id'],
                       "procedure": "",
                       "name": p[i]['name'],
                       "yes_no": "Yes / No"})
-
-            
-
         return q
-        
+
 report_sxw.report_sxw(
     'report.mgmtsystem.audit.verificationlist',
     'mgmtsystem.audit',

=== modified file 'mgmtsystem_audit/wizard/__init__.py'
--- mgmtsystem_audit/wizard/__init__.py	2012-12-17 17:18:12 +0000
+++ mgmtsystem_audit/wizard/__init__.py	2013-09-10 15:25:36 +0000
@@ -1,5 +1,3 @@
 # -*- encoding: utf-8 -*-
-
-import copy_verification_lines
-
+from . import copy_verification_lines
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_audit/wizard/copy_verification_lines.py'
--- mgmtsystem_audit/wizard/copy_verification_lines.py	2012-12-17 17:18:12 +0000
+++ mgmtsystem_audit/wizard/copy_verification_lines.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,25 +15,25 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from osv import fields, osv
 
+
 class copy_verification_lines(osv.osv_memory):
     """
     Copy Verification Lines
     """
     _name = "copy.verification.lines"
     _description = "Copy Verification Lines"
-
     _columns = {
-        'audit_src': fields.many2one('mgmtsystem.audit','Choose audit'),
+        'audit_src': fields.many2one('mgmtsystem.audit', 'Choose audit'),
     }
 
     def copy(self, cr, uid, ids, context=None):
-	# Code to copy verification lines from the chosen audit to the current one
+        # Code to copy verification lines from the chosen audit to the current one
         if context is None:
             context = {}
 
@@ -42,14 +42,14 @@
         src_id = self.read(cr, uid, ids, [], context=context)[0]['audit_src'][0]
 
         for line in audit_proxy.browse(cr, uid, src_id, context=context).line_ids:
-            verification_line_proxy.create(cr,uid, {
-                'seq' : line.seq,
-                'name' : line.name,
-                'audit_id' : context['active_id'],
-                'procedure_id' : line.procedure_id.id,
-                'is_conformed' : False,
+            verification_line_proxy.create(cr, uid, {
+                'seq': line.seq,
+                'name': line.name,
+                'audit_id': context['active_id'],
+                'procedure_id': line.procedure_id.id,
+                'is_conformed': False,
             }, context=context)
-        return {'type':'ir.actions.act_window_close'}
+        return {'type': 'ir.actions.act_window_close'}
 
 copy_verification_lines()
 

=== modified file 'mgmtsystem_nonconformity/__openerp__.py'
--- mgmtsystem_nonconformity/__openerp__.py	2013-08-26 03:22:45 +0000
+++ mgmtsystem_nonconformity/__openerp__.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -19,23 +19,23 @@
 #
 ##############################################################################
 {
-    "name" : "Management System - Nonconformity",
-    "version" : "1.1",
-    "author" : "Savoir-faire Linux",
-    "website" : "http://www.savoirfairelinux.com",
-    "license" : "AGPL-3",
-    "category" : "Management System",
+    "name": "Management System - Nonconformity",
+    "version": "1.2",
+    "author": "Savoir-faire Linux",
+    "website": "http://www.savoirfairelinux.com",
+    "license": "AGPL-3",
+    "category": "Management System",
     "description": """\
-This module enables you to manage the nonconformities of your management 
-system : quality (ISO9001), environment (ISO14001) or security (ISO27001).	
+This module enables you to manage the nonconformities of your management
+system: quality (ISO9001), environment (ISO14001) or security (ISO27001).
 
 WARNING: when upgrading from v0.1, data conversion is required, since there are subtancial changes to the data structure.
     """,
-    "depends" : [
+    "depends": [
         'mgmtsystem_action',
         'document_page_procedure',
     ],
-    "data" : [
+    "data": [
         'security/ir.model.access.csv',
         'security/mgmtsystem_nonconformity_security.xml',
         'mgmtsystem_nonconformity.xml',
@@ -44,10 +44,9 @@
         'board_mgmtsystem_nonconformity.xml',
         'mgmtsystem_nonconformity_data.xml',
     ],
-    "demo" : [
+    "demo": [
         'demo_nonconformity.xml',
     ],
-    "installable" : True,
+    "installable": True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'mgmtsystem_nonconformity/demo_nonconformity.xml'
--- mgmtsystem_nonconformity/demo_nonconformity.xml	2012-10-30 20:43:51 +0000
+++ mgmtsystem_nonconformity/demo_nonconformity.xml	2013-09-10 15:25:36 +0000
@@ -18,6 +18,7 @@
         <record id="demo_nonconformity" model="mgmtsystem.nonconformity">
             <field name="partner_id" ref="base.res_partner_3"/>
             <field name="date">2010-12-03</field>
+            <field name="name">Demo Nonconformity</field>
             <field name="responsible_user_id" ref="base.user_demo"/>
             <field name="manager_user_id" ref="base.user_root"/>
             <field name="author_user_id" ref="base.user_demo"/>

=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.py	2013-09-05 20:36:23 +0000
+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.py	2013-09-10 15:25:36 +0000
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
@@ -15,29 +15,31 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.  
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 from tools.translate import _
 import netsvc as netsvc
 from openerp.osv import fields, orm
+from openerp.addons.base_status.base_state import base_state
 
 import time
 from tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT
 from tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
 
+
 class mgmtsystem_nonconformity_cause(orm.Model):
     """
     Cause of the nonconformity of the management system
     """
     _name = "mgmtsystem.nonconformity.cause"
     _description = "Cause of the nonconformity of the management system"
-    _order   = 'parent_id, sequence' 
+    _order = 'parent_id, sequence'
 
     def name_get(self, cr, uid, ids, context=None):
         ids = ids or []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -45,7 +47,7 @@
                 name = record['parent_id'][1]+' / '+name
             res.append((record['id'], name))
         return res
-        
+
     def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
@@ -73,11 +75,11 @@
     """
     _name = "mgmtsystem.nonconformity.origin"
     _description = "Origin of nonconformity of the management system"
-    _order   = 'parent_id, sequence' 
+    _order = 'parent_id, sequence'
 
     def name_get(self, cr, uid, ids, context=None):
         ids = ids or []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -85,7 +87,7 @@
                 name = record['parent_id'][1]+' / '+name
             res.append((record['id'], name))
         return res
-        
+
     def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
@@ -127,16 +129,17 @@
     ('done', _('Closed')),
     ('cancel', _('Cancelled')),
     ]
-_STATES_DICT =  dict(_STATES)
-
-class mgmtsystem_nonconformity(orm.Model):
+_STATES_DICT = dict(_STATES)
+
+
+class mgmtsystem_nonconformity(base_state, orm.Model):
     """
-    Management System - Nonconformity 
+    Management System - Nonconformity
     """
     _name = "mgmtsystem.nonconformity"
     _description = "Nonconformity of the management system"
     _rec_name = "description"
-    _inherit = ['mail.thread']
+    _inherit = ['crm.claim']
     _order = "date desc"
 
     def _state_name(self, cr, uid, ids, name, args, context=None):
@@ -152,35 +155,31 @@
         'date': fields.date('Date', required=True),
         'partner_id': fields.many2one('res.partner', 'Partner', required=True),
         'reference': fields.char('Related to', size=50),
-        'responsible_user_id': fields.many2one('res.users','Responsible', required=True),
-        'manager_user_id': fields.many2one('res.users','Manager', required=True),
-        'author_user_id': fields.many2one('res.users','Filled in by', required=True),
-        'origin_ids': fields.many2many('mgmtsystem.nonconformity.origin','mgmtsystem_nonconformity_origin_rel', 'nonconformity_id', 'origin_id', 'Origin', required=True),
-        'procedure_ids': fields.many2many('document.page','mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
+        'responsible_user_id': fields.many2one('res.users', 'Responsible', required=True),
+        'manager_user_id': fields.many2one('res.users', 'Manager', required=True),
+        'author_user_id': fields.many2one('res.users', 'Filled in by', required=True),
+        'origin_ids': fields.many2many('mgmtsystem.nonconformity.origin', 'mgmtsystem_nonconformity_origin_rel', 'nonconformity_id', 'origin_id', 'Origin', required=True),
+        'procedure_ids': fields.many2many('document.page', 'mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
         'description': fields.text('Description', required=True),
         'state': fields.selection(_STATES, 'State', readonly=True),
         'state_name': fields.function(_state_name, string='State Description', type='char', size=40),
         'system_id': fields.many2one('mgmtsystem.system', 'System'),
-        'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
         #2. Root Cause Analysis
-        'cause_ids': fields.many2many('mgmtsystem.nonconformity.cause','mgmtsystem_nonconformity_cause_rel', 'nonconformity_id', 'cause_id', 'Cause'),
+        'cause_ids': fields.many2many('mgmtsystem.nonconformity.cause', 'mgmtsystem_nonconformity_cause_rel', 'nonconformity_id', 'cause_id', 'Cause'),
         'severity_id': fields.many2one('mgmtsystem.nonconformity.severity', 'Severity'),
         'analysis': fields.text('Analysis'),
-        'immediate_action_id': fields.many2one('mgmtsystem.action', 'Immediate action',
-            domain="[('nonconformity_id','=',id)]"),
+        'immediate_action_id': fields.many2one('mgmtsystem.action', 'Immediate action', domain="[('nonconformity_id','=',id)]"),
         'analysis_date': fields.datetime('Analysis Date', readonly=True),
-        'analysis_user_id': fields.many2one('res.users','Analysis by', readonly=True),
+        'analysis_user_id': fields.many2one('res.users', 'Analysis by', readonly=True),
         #3. Action Plan
         'action_ids': fields.many2many('mgmtsystem.action', 'mgmtsystem_nonconformity_action_rel', 'nonconformity_id', 'action_id', 'Actions'),
         'actions_date': fields.datetime('Action Plan Date', readonly=True),
-        'actions_user_id': fields.many2one('res.users','Action Plan by', readonly=True),
-        'action_comments': fields.text('Action Plan Comments',
-            help="Comments on the action plan."),
+        'actions_user_id': fields.many2one('res.users', 'Action Plan by', readonly=True),
+        'action_comments': fields.text('Action Plan Comments', help="Comments on the action plan."),
         #4. Effectiveness Evaluation
         'evaluation_date': fields.datetime('Evaluation Date', readonly=True),
-        'evaluation_user_id': fields.many2one('res.users','Evaluation by', readonly=True),
-        'evaluation_comments': fields.text('Evaluation Comments',
-            help="Conclusions from the last effectiveness evaluation."),
+        'evaluation_user_id': fields.many2one('res.users', 'Evaluation by', readonly=True),
+        'evaluation_comments': fields.text('Evaluation Comments', help="Conclusions from the last effectiveness evaluation."),
         # Multi-company
         'company_id': fields.many2one('res.company', 'Company'),
     }
@@ -199,10 +198,36 @@
         })
         return super(mgmtsystem_nonconformity, self).create(cr, uid, vals, context)
 
+    def message_auto_subscribe(self, cr, uid, ids, updated_fields, context=None):
+        """Add the reponsible, manager and OpenChatter follow list."""
+        o = self.browse(cr, uid, ids, context=context)[0]
+        user_ids = [o.responsible_user_id.id, o.manager_user_id.id, o.author_user_id.id]
+        self.message_subscribe_users(cr, uid, ids, user_ids=user_ids, subtype_ids=None, context=context)
+        return super(mgmtsystem_nonconformity, self).message_auto_subscribe(cr, uid, ids, updated_fields=updated_fields, context=context)
+
+    def case_send_note(self, cr, uid, ids, text, data=None, context=None):
+        for id in ids:
+            pre = self.case_get_note_msg_prefix(cr, uid, id, context=context)
+            msg = '%s <b>%s</b>' % (pre, text)
+            if data:
+                o = self.browse(cr, uid, ids, context=context)[0]
+                post = _('\n<br />\n<ul><li> <b>Stage:</b> %s \xe2\x86\x92 %s</li></ul>') % (o.state, data['state'])
+                msg += post
+            self.message_post(cr, uid, [id], body=msg, context=context)
+        return True
+
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return _('Nonconformity')
+
+
     def wkf_analysis(self, cr, uid, ids, context=None):
         """Change state from draft to analysis"""
-        self.message_post(cr, uid, self.browse(cr, uid, ids), _('Analysis'))
-        return self.write(cr, uid, ids, {'state': 'analysis', 'analysis_date': None, 'analysis_user_id': None}, context=context)
+        data = {
+            'state': 'analysis',
+            'analysis_date': None,
+            'analysis_user_id': None}
+        self.case_send_note(cr, uid, ids, _('Analysis'), data=data, context=context)
+        return self.write(cr, uid, ids, data, context=context)
 
     def action_sign_analysis(self, cr, uid, ids, context=None):
         """Sign-off the analysis"""
@@ -213,18 +238,24 @@
             raise orm.except_orm(_('Error !'), _('Analysis is already approved.'))
         if not o.analysis:
             raise orm.except_orm(_('Error !'), _('Please provide an analysis before approving.'))
-        vals = {'analysis_date': time.strftime(DATETIME_FORMAT), 'analysis_user_id': uid }
+        vals = {'analysis_date': time.strftime(DATETIME_FORMAT), 'analysis_user_id': uid}
         self.write(cr, uid, ids, vals, context=context)
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Analysis Approved'))
+        note = _('Analysis Approved')
+        self.case_send_note(cr, uid, ids, note, context=context)
         return True
 
     def wkf_review(self, cr, uid, ids, context=None):
         """Change state from analysis to pending approval"""
         o = self.browse(cr, uid, ids, context=context)[0]
         if not o.analysis_date:
-            raise orm.except_orm(_('Error !'), _('Analysis must be performed before submiting to approval.'))
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Pending Approval'))
-        return self.write(cr, uid, ids, {'state': 'pending', 'actions_date': None, 'actions_user_id': None}, context=context)
+            err = _('Analysis must be performed before submiting to approval.')
+            raise orm.except_orm(_('Error !'), err)
+        vals = {
+            'state': 'pending',
+            'actions_date': None,
+            'actions_user_id': None}
+        self.case_send_note(cr, uid, ids, _('Pending Approval'), data=vals, context=context)
+        return self.write(cr, uid, ids, vals, context=context)
 
     def action_sign_actions(self, cr, uid, ids, context=None):
         """Sign-off the action plan"""
@@ -235,9 +266,10 @@
             raise orm.except_orm(_('Error !'), _('Action plan is already approved.'))
         if not self.browse(cr, uid, ids, context=context)[0].analysis_date:
             raise orm.except_orm(_('Error !'), _('Analysis approved before the review confirmation.'))
-        vals = {'actions_date': time.strftime(DATETIME_FORMAT), 'actions_user_id': uid }
+        vals = {'actions_date': time.strftime(DATETIME_FORMAT), 'actions_user_id': uid}
         self.write(cr, uid, ids, vals, context=context)
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Action Plan Approved'))
+        note = _('Action Plan Approved')
+        self.case_send_note(cr, uid, ids, note, context=context)
         return True
 
     def wkf_open(self, cr, uid, ids, context=None):
@@ -245,7 +277,7 @@
         o = self.browse(cr, uid, ids, context=context)[0]
         if not o.actions_date:
             raise orm.except_orm(_('Error !'), _('Action plan must be approved before opening.'))
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('In Progress'))
+        self.case_open_send_note(cr, uid, ids, context=context)
         #Open related Actions
         if o.immediate_action_id and o.immediate_action_id.state == 'draft':
             o.immediate_action_id.case_open()
@@ -259,14 +291,15 @@
         o = self.browse(cr, uid, ids, context=context)[0]
         if o.state != 'open':
             raise orm.except_orm(_('Error !'), _('This action can only be done in the In Progress state.'))
-        vals = {'evaluation_date': time.strftime(DATETIME_FORMAT), 'evaluation_user_id': uid }
+        vals = {'evaluation_date': time.strftime(DATETIME_FORMAT), 'evaluation_user_id': uid}
         self.write(cr, uid, ids, vals, context=context)
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Effectiveness Evaluation Approved'))
+        note = _('Effectiveness Evaluation Approved')
+        self.case_send_note(cr, uid, ids, note, context=context)
         return True
 
     def wkf_cancel(self, cr, uid, ids, context=None):
         """Change state to cancel"""
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Cancel'))
+        self.case_cancel_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
 
     def wkf_close(self, cr, uid, ids, context=None):
@@ -279,21 +312,21 @@
             raise orm.except_orm(_('Error !'), _('Not all actions have been closed.'))
         if not o.evaluation_date:
             raise orm.except_orm(_('Error !'), _('Effectiveness evaluation must be performed before closing.'))
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Close'))
+        self.case_close_send_note(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def case_reset(self, cr, uid, ids, context=None, *args):
         """Reset to Draft and restart the workflows"""
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
-            res = wf_service.trg_create(uid, self._name, id, cr)
-        self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Draft'))
+            wf_service.trg_create(uid, self._name, id, cr)
+        self.case_reset_send_note(cr, uid, ids, context=context)
         vals = {
             'state': 'draft',
-            'analysis_date': None, 'analysis_user_id': None, 
+            'analysis_date': None, 'analysis_user_id': None,
             'actions_date': None, 'actions_user_id': None,
             'evaluation_date': None, 'evaluation_user_id': None,
-            }
+        }
         return self.write(cr, uid, ids, vals, context=context)
 
 
@@ -301,8 +334,7 @@
     _inherit = "mgmtsystem.action"
     _columns = {
         'nonconformity_immediate_id': fields.one2many('mgmtsystem.nonconformity', 'immediate_action_id', readonly=True),
-        'nonconformity_ids': fields.many2many(
-            'mgmtsystem.nonconformity', 'mgmtsystem_nonconformity_action_rel', 'action_id', 'nonconformity_id', 'Nonconformities', readonly=True),
+        'nonconformity_ids': fields.many2many('mgmtsystem.nonconformity', 'mgmtsystem_nonconformity_action_rel', 'action_id', 'nonconformity_id', 'Nonconformities', readonly=True),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml'
--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml	2013-08-25 15:20:05 +0000
+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml	2013-09-10 15:25:36 +0000
@@ -72,8 +72,10 @@
                 <form string="Non-Conformity" version="7.0">
                     <header>
                         <button name="button_cancel" string="Cancel" states="draft,analysis,pending,open"/>
-                        <button name="button_analysis" string="Send for Analysis" states="draft,pending" class="oe_highlight"/>
-                        <button name="button_review" string="Send for Review" states="analysis,open" class="oe_highlight"/>
+                        <button name="button_analysis_n" string="Send for Analysis" states="draft" class="oe_highlight"/>
+                        <button name="button_analysis_p" string="Send for Analysis" states="pending"/>
+                        <button name="button_review_n" string="Send for Review" states="analysis" class="oe_highlight"/>
+                        <button name="button_review_p" string="Send for Review" states="open"/>
                         <button name="button_open" string="Start/Open" states="pending" class="oe_highlight"/>
                         <button name="button_close" string="Close" class="oe_highlight"
                             states="open" groups="mgmtsystem.group_mgmtsystem_manager,mgmtsystem.group_mgmtsystem_auditor"/>
@@ -97,9 +99,9 @@
 	            		<field name="company_id" group="base.group_multi_company"/>
                     	</group>
                     </group>
-                    
+
                     <notebook>
-                    
+
                         <page string="Description">
                             <field name="description" placeholder="Add a description ..." attrs="{'readonly':[('state','not in',['draft','analysis'])]}"/>
                         </page>
@@ -157,36 +159,14 @@
                                 </group>
                             </group>
                         </page>
-                        
-                        <!-- Communication History -->
-                        <!-- TODO: REMOVE and migrate to Chatter -->
-                        <page string="Communication &amp; History">
-                            <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
-                                <tree string="History">
-                                    <field name="subject" string="History Information"/>
-                                    <field name="email_from" invisible="1"/>
-                                    <button
-                                        string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
-                                        icon="terp-mail-replied" type="action" />
-                                </tree>
-                            </field>
-                           <separator colspan="4"/>
-                            <button string="Send New Email"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action"/>
-                        </page>
 
                     </notebook>
                 </sheet>
 
-                <!-- TODO: migrate to Chatter
                 <div class="oe_chatter">
                     <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
-                -->
 
                 </form>
             </field>
@@ -267,7 +247,7 @@
             groups="mgmtsystem.group_mgmtsystem_manager"/>
 
         <!-- Cause -->
-        
+
         <record id="view_mgmtsystem_nonconformity_cause_form" model="ir.ui.view">
             <field name="name">mgmtsystem.nonconformity.cause.form</field>
             <field name="type">form</field>
@@ -323,7 +303,7 @@
             parent="menu_mgmtsystem_configuration_nonconformities"
             sequence="30" 
             groups="mgmtsystem.group_mgmtsystem_manager"/>
-       
+
         <!-- Severity -->
         <record id="view_mgmtsystem_nonconformity_severity_form" model="ir.ui.view">
             <field name="name">mgmtsystem.nonconformity.severity.form</field>

=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity_workflow.xml'
--- mgmtsystem_nonconformity/mgmtsystem_nonconformity_workflow.xml	2012-10-25 13:38:14 +0000
+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity_workflow.xml	2013-09-10 15:25:36 +0000
@@ -69,14 +69,14 @@
         <record model="workflow.transition" id="mgmtsystem_nonconformity_draft_analysis">
             <field name="act_from" ref="mgmtsystem_nonconformity_draft"/>
             <field name="act_to" ref="mgmtsystem_nonconformity_analysis"/>
-            <field name="signal">button_analysis</field>
+            <field name="signal">button_analysis_n</field>
             <field name="condition">True</field>
         </record>
 
         <record model="workflow.transition" id="mgmtsystem_nonconformity_analysis_pending">
             <field name="act_from" ref="mgmtsystem_nonconformity_analysis"/>
             <field name="act_to" ref="mgmtsystem_nonconformity_pending"/>
-            <field name="signal">button_review</field>
+            <field name="signal">button_review_n</field>
             <field name="condition">True</field>
         </record>
 
@@ -90,14 +90,14 @@
         <record model="workflow.transition" id="mgmtsystem_nonconformity_open_pending">
             <field name="act_from" ref="mgmtsystem_nonconformity_open"/>
             <field name="act_to" ref="mgmtsystem_nonconformity_pending"/>
-            <field name="signal">button_review</field>
+            <field name="signal">button_review_p</field>
             <field name="condition">True</field>
         </record>
 
         <record model="workflow.transition" id="mgmtsystem_nonconformity_pending_analysis">
             <field name="act_from" ref="mgmtsystem_nonconformity_pending"/>
             <field name="act_to" ref="mgmtsystem_nonconformity_analysis"/>
-            <field name="signal">button_analysis</field>
+            <field name="signal">button_analysis_p</field>
             <field name="condition">True</field>
         </record>
 

=== modified file 'mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py'
--- mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py	2013-04-01 19:13:26 +0000
+++ mgmtsystem_nonconformity/migrations/7.0.1.0/post-migration.py	2013-09-10 15:25:36 +0000
@@ -25,6 +25,7 @@
 
 logger = logging.getLogger('upgrade')
 
+
 def migrate(cr, version):
     logger.info("Migrating mgmtsystem_nonconformity from version %s", version)
     cr.execute("select count(*) from mgmtsystem_nonconformity_action_rel")
@@ -33,17 +34,17 @@
         logger.info("Moving nonconformity/action relations to mgmtsystem_nonconformity_action_rel")
         for action_field in ('preventive_action_id', 'immediate_action_id', 'corrective_action_id'):
             cr.execute("insert into mgmtsystem_nonconformity_action_rel"
-               "(nonconformity_id, action_id) "
-               "(SELECT id, %s FROM "
-               " mgmtsystem_nonconformity "
-               "WHERE %s IS NOT NULL )" % (action_field, action_field))
+                       "(nonconformity_id, action_id) "
+                       "(SELECT id, %s FROM "
+                       " mgmtsystem_nonconformity "
+                       "WHERE %s IS NOT NULL )" % (action_field, action_field))
     else:
         logger.warning("Attempt to migrate nonconformity action IDs failed: migration was already done.")
 
     logger.info("Concatening action comments into evaluation_comments")
     cr.execute("update mgmtsystem_nonconformity set evaluation_comments = "
-           "effectiveness_preventive || ' ' || effectiveness_immediate || ' ' || effectiveness_corrective "
-           "where evaluation_comments is null")
+               "effectiveness_preventive || ' ' || effectiveness_immediate || ' ' || effectiveness_corrective "
+               "where evaluation_comments is null")
 
     logger.info("Updating state flags")
     cr.execute("update mgmtsystem_nonconformity set state = 'open' where state = 'o'")

=== modified file 'mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py'
--- mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py	2013-04-12 15:10:42 +0000
+++ mgmtsystem_nonconformity_deptm/mgmtsystem_nonconformity.py	2013-09-10 15:25:36 +0000
@@ -37,5 +37,11 @@
                 result['superior_user_id'] = deptm.parent_id.manager_id.user_id.id
         return {'value': result}
 
+    def message_auto_subscribe(self, cr, uid, ids, updated_fields, context=None):
+        """Add the Top Manager to OpenChatter follow list."""
+        o = self.browse(cr, uid, ids, context=context)[0]
+        user_ids = [o.superior_user_id.id]
+        self.message_subscribe_users(cr, uid, ids, user_ids=user_ids, subtype_ids=None, context=context)
+        return super(mgmtsystem_nonconformity, self).message_auto_subscribe(cr, uid, ids, updated_fields=updated_fields, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: