OpenERP Management System

Merge lp:~hsoft/openerp-mgmtsystem/trunk-merge-7.0-fix into lp:openerp-mgmtsystem

  1. trunk-merge-7.0-fix
  2. Merge into 7.0
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 18
Proposed branch: lp:~hsoft/openerp-mgmtsystem/trunk-merge-7.0-fix
Merge into: lp:openerp-mgmtsystem
Diff against target: 136 lines (+80/-28)
2 files modified
mgmtsystem_audit/mgmtsystem_audit.xml (+2/-2)
mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml (+78/-26)
To merge this branch: bzr merge lp:~hsoft/openerp-mgmtsystem/trunk-merge-7.0-fix
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Review via email: mp+146712@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mgmtsystem_audit/mgmtsystem_audit.xml'
2--- mgmtsystem_audit/mgmtsystem_audit.xml 2013-02-04 15:10:28 +0000
3+++ mgmtsystem_audit/mgmtsystem_audit.xml 2013-02-05 19:43:24 +0000
4@@ -27,7 +27,7 @@
5 <group>
6 <field name="seq"/>
7 <field name="name"/>
8- <field name="procedure_id" domain="[('parent_id','=','Procedure')]"/>
9+ <field name="procedure_id" domain="[('group_id','=','Procedure')]"/>
10 <field name="is_conformed"/>
11 <field name="comments"/>
12 </group>
13@@ -45,7 +45,7 @@
14 <field name="name"/>
15 <field name="is_conformed"/>
16 <newline/>
17- <field name="procedure_id" domain="[('parent_id','=','Procedure')]"/>
18+ <field name="procedure_id" domain="[('group_id','=','Procedure')]"/>
19 <field name="seq"/>
20 <newline/>
21 <field name="comments"/>
22
23=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml'
24--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-02-04 15:10:28 +0000
25+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-02-05 19:43:24 +0000
26@@ -89,32 +89,84 @@
27 <field name="origin_ids" nolabel="1" colspan="4" attrs="{'readonly':[('state','not in',['draft','analysis'])]}"/>
28 </page>
29 <page string="Procedures">
30- <field name="procedure_ids" nolabel="1" attrs="{'readonly':[('state','=','c')]}" domain="[('parent_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
31- </page>
32- <page string="Description">
33- <field name="description" nolabel="1" attrs="{'readonly':[('state','=','c')]}"/>
34- </page>
35- <page string="Causes">
36- <field name="cause_ids" nolabel="1" attrs="{'readonly':[('state','=','c')]}"/>
37- </page>
38- <page string="Analysis">
39- <field name="analysis" nolabel="1" attrs="{'readonly':[('state','=','c')]}"/>
40- </page>
41- <page string="Actions">
42- <group colspan="4">
43- <field name="immediate_action_id" colspan="4" domain="[('type_action','=','immediate')]" attrs="{'readonly':[('state','=','c')]}"/>
44- <newline/>
45- <field name="effectiveness_immediate" colspan="4" attrs="{'readonly':[('state','=','c')]}"/>
46- <separator/>
47- <field name="corrective_action_id" colspan="4" domain="[('type_action','=','correction')]" attrs="{'readonly':[('state','=','c')]}"/>
48- <newline/>
49- <field name="effectiveness_corrective" colspan="4" attrs="{'readonly':[('state','=','c')]}"/>
50- <separator/>
51- <field name="preventive_action_id" colspan="4" domain="[('type_action','=','prevention')]" attrs="{'readonly':[('state','=','c')]}"/>
52- <newline/>
53- <field name="effectiveness_preventive" colspan="4" attrs="{'readonly':[('state','=','c')]}"/>
54- </group>
55- </page>
56+ <field name="procedure_ids" nolabel="1" attrs="{'readonly':[('state','not in',['draft','analysis'])]}"
57+ domain="[('group_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
58+ </page>
59+
60+ <page string="Causes and Analysis" attrs="{'invisible':[('state','in',['draft','cancel'])]}">
61+ <separator string="Analysis" colspan="4"/>
62+ <field name="analysis" nolabel="1" colspan="4"
63+ attrs="{'readonly':[('state','not in',['analysis'])], 'required':[('state','in',['analysis','pending','open'])]}"/>
64+ <newline/>
65+
66+ <separator string="Causes" colspan="4"/>
67+ <field name="cause_ids" nolabel="1" colspan="4" attrs="{'readonly':[('state','not in',['analysis'])]}"/>
68+ <newline/>
69+
70+ <separator string="Analysis Confirmation" colspan="4"/>
71+ <group colspan="2" col="2">
72+ <field name="severity_id" attrs="{'readonly':[('state','not in',['analysis'])]}"/>
73+ <field name="immediate_action_id" domain="[('type_action','=','immediate')]"
74+ attrs="{'readonly':[('state','not in',['analysis'])]}"/>
75+ </group>
76+ <group colspan="2" col="2">
77+ <field name="analysis_user_id"/>
78+ <field name="analysis_date"/>
79+ <button name="action_sign_analysis" string="Approve" icon="terp-camera_test"
80+ type="object" states="analysis"
81+ groups="mgmtsystem.group_mgmtsystem_user_manager"/>
82+ </group>
83+ </page>
84+
85+ <page string="Actions" attrs="{'invisible':[('state','in',['draft','analysis','cancel'])]}">
86+ <separator string="Action Plan" colspan="4" />
87+ <field name="action_ids" nolabel="1" colspan="4"
88+ attrs="{'readonly':[('state','not in',['pending'])]}"/>
89+
90+ <group colspan="2" col="2">
91+ <separator string="Plan Review" colspan="2"/>
92+ <field name="action_comments" colspan="2" nolabel="1"
93+ attrs="{'readonly':[('state','not in',['pending'])]}"/>
94+ <field name="actions_user_id"/>
95+ <field name="actions_date"/>
96+ <button name="action_sign_actions" string="Approve" icon="terp-camera_test"
97+ type="object" states="pending"
98+ groups="mgmtsystem.group_mgmtsystem_user_manager"/>
99+ </group>
100+
101+ <group colspan="2" col="2" attrs="{'invisible':[('state','not in',['open','done'])]}">
102+ <separator string="Effectiveness Review" colspan="2"/>
103+ <field name="evaluation_comments" nolabel="1" colspan="2"
104+ attrs="{'readonly':[('state','not in',['open'])]}"/>
105+ <field name="evaluation_user_id"/>
106+ <field name="evaluation_date"/>
107+ <button name="action_sign_evaluation" string="Sign Evaluation" icon="terp-camera_test"
108+ type="object" states="open"
109+ groups="mgmtsystem.group_mgmtsystem_auditor"/>
110+ </group>
111+ </page>
112+
113+ <!-- Communication History -->
114+ <page string="Communication &amp; History">
115+ <field name="message_ids" colspan="4" nolabel="1" mode="tree" readonly="1">
116+ <tree string="History">
117+ <field name="subject" string="History Information"/>
118+ <field name="email_from" invisible="1"/>
119+ <button
120+ string="Reply" attrs="{'invisible': [('email_from', '=', False)]}"
121+ name="%(mail.action_email_compose_message_wizard)d"
122+ context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
123+ icon="terp-mail-replied" type="action" />
124+ </tree>
125+ </field>
126+ <separator colspan="4"/>
127+ <button string="Send New Email"
128+ name="%(mail.action_email_compose_message_wizard)d"
129+ icon="terp-mail-message-new" type="action"/>
130+
131+ </page>
132+
133+
134 </notebook>
135 <group col="8" colspan="4">
136 <field name="state" widget="statusbar" statusbar_visible="draft,analysis,pending,open,done"/>