OpenERP Management System

Merge lp:~jonatan-cloutier/openerp-mgmtsystem/7.0-Fix-1162946 into lp:openerp-mgmtsystem

  1. 7.0-Fix-1162946
  2. Merge into 7.0
Proposed by Jonatan Cloutier
Status: Merged
Merged at revision: 30
Proposed branch: lp:~jonatan-cloutier/openerp-mgmtsystem/7.0-Fix-1162946
Merge into: lp:openerp-mgmtsystem
Diff against target: 94 lines (+10/-10)
2 files modified
mgmtsystem_nonconformity/mgmtsystem_nonconformity.py (+9/-9)
mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml (+1/-1)
To merge this branch: bzr merge lp:~jonatan-cloutier/openerp-mgmtsystem/7.0-Fix-1162946
Reviewer Review Type Date Requested Status
Joao Alfredo Gama Batista Approve
Review via email: mp+156582@code.launchpad.net

Description of the change

fix bug #1162946, update mail.thread usage of notification

To post a comment you must log in.
Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

lgtm. not tested.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.py'
2--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.py 2013-01-31 14:21:30 +0000
3+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.py 2013-04-02 14:43:23 +0000
4@@ -197,7 +197,7 @@
5
6 def wkf_analysis(self, cr, uid, ids, context=None):
7 """Change state from draft to analysis"""
8- self.message_append(cr, uid, self.browse(cr, uid, ids), _('Analysis'))
9+ self.message_post(cr, uid, self.browse(cr, uid, ids), _('Analysis'))
10 return self.write(cr, uid, ids, {'state': 'analysis', 'analysis_date': None, 'analysis_user_id': None}, context=context)
11
12 def action_sign_analysis(self, cr, uid, ids, context=None):
13@@ -211,7 +211,7 @@
14 raise osv.except_osv(_('Error !'), _('Please provide an analysis before approving.'))
15 vals = {'analysis_date': time.strftime(DATETIME_FORMAT), 'analysis_user_id': uid }
16 self.write(cr, uid, ids, vals, context=context)
17- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Analysis Approved'))
18+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Analysis Approved'))
19 return True
20
21 def wkf_review(self, cr, uid, ids, context=None):
22@@ -219,7 +219,7 @@
23 o = self.browse(cr, uid, ids, context=context)[0]
24 if not o.analysis_date:
25 raise osv.except_osv(_('Error !'), _('Analysis must be performed before submiting to approval.'))
26- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Pending Approval'))
27+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Pending Approval'))
28 return self.write(cr, uid, ids, {'state': 'pending', 'actions_date': None, 'actions_user_id': None}, context=context)
29
30 def action_sign_actions(self, cr, uid, ids, context=None):
31@@ -233,7 +233,7 @@
32 raise osv.except_osv(_('Error !'), _('Analysis approved before the review confirmation.'))
33 vals = {'actions_date': time.strftime(DATETIME_FORMAT), 'actions_user_id': uid }
34 self.write(cr, uid, ids, vals, context=context)
35- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Action Plan Approved'))
36+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Action Plan Approved'))
37 return True
38
39 def wkf_open(self, cr, uid, ids, context=None):
40@@ -241,7 +241,7 @@
41 o = self.browse(cr, uid, ids, context=context)[0]
42 if not o.actions_date:
43 raise osv.except_osv(_('Error !'), _('Action plan must be approved before opening.'))
44- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('In Progress'))
45+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('In Progress'))
46 #Open related Actions
47 if o.immediate_action_id and o.immediate_action_id.state == 'draft':
48 o.immediate_action_id.case_open(cr, uid, [o.immediate_action_id.id])
49@@ -257,12 +257,12 @@
50 raise osv.except_osv(_('Error !'), _('This action can only be done in the In Progress state.'))
51 vals = {'evaluation_date': time.strftime(DATETIME_FORMAT), 'evaluation_user_id': uid }
52 self.write(cr, uid, ids, vals, context=context)
53- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Effectiveness Evaluation Approved'))
54+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Effectiveness Evaluation Approved'))
55 return True
56
57 def wkf_cancel(self, cr, uid, ids, context=None):
58 """Change state to cancel"""
59- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Cancel'))
60+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Cancel'))
61 return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
62
63 def wkf_close(self, cr, uid, ids, context=None):
64@@ -270,7 +270,7 @@
65 o = self.browse(cr, uid, ids, context=context)[0]
66 if not o.evaluation_date:
67 raise osv.except_osv(_('Error !'), _('Effectiveness evaluation must be performed before closing.'))
68- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Close'))
69+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Close'))
70 return self.write(cr, uid, ids, {'state': 'done'}, context=context)
71
72 def case_reset(self, cr, uid, ids, context=None, *args):
73@@ -278,7 +278,7 @@
74 wf_service = netsvc.LocalService("workflow")
75 for id in ids:
76 res = wf_service.trg_create(uid, self._name, id, cr)
77- self.message_append(cr, uid, self.browse(cr, uid, ids, context=context), _('Draft'))
78+ self.message_post(cr, uid, self.browse(cr, uid, ids, context=context), _('Draft'))
79 vals = {
80 'state': 'draft',
81 'analysis_date': None, 'analysis_user_id': None,
82
83=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml'
84--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-02-08 16:05:22 +0000
85+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-04-02 14:43:23 +0000
86@@ -100,7 +100,7 @@
87 </page>
88 <page string="Procedures">
89 <field name="procedure_ids" nolabel="1" attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
90- domain="[('group_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
91+ domain="[('parent_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
92 </page>
93
94 <page string="Causes and Analysis" attrs="{'invisible':[('state','in',['draft','cancel'])]}">