OpenERP Management System

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

  1. 7.0-fix-1111835
  2. Merge into 7.0
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 15
Proposed branch: lp:~hsoft/openerp-mgmtsystem/7.0-fix-1111835
Merge into: lp:openerp-mgmtsystem
Diff against target: 34 lines (+3/-3)
2 files modified
mgmtsystem_audit/mgmtsystem_audit.xml (+2/-2)
mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml (+1/-1)
To merge this branch: bzr merge lp:~hsoft/openerp-mgmtsystem/7.0-fix-1111835
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Review via email: mp+146428@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-01-30 16:00:23 +0000
3+++ mgmtsystem_audit/mgmtsystem_audit.xml 2013-02-04 14:47:29 +0000
4@@ -27,7 +27,7 @@
5 <group>
6 <field name="seq"/>
7 <field name="name"/>
8- <field name="procedure_id" domain="[('group_id','=','Procedure')]"/>
9+ <field name="procedure_id" domain="[('parent_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="[('group_id','=','Procedure')]"/>
18+ <field name="procedure_id" domain="[('parent_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-01-30 16:00:23 +0000
25+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-02-04 14:47:29 +0000
26@@ -75,7 +75,7 @@
27 <field name="origin_ids" nolabel="1" attrs="{'readonly':[('state','=','c')]}"/>
28 </page>
29 <page string="Procedures">
30- <field name="procedure_ids" nolabel="1" attrs="{'readonly':[('state','=','c')]}" domain="[('group_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
31+ <field name="procedure_ids" nolabel="1" attrs="{'readonly':[('state','=','c')]}" domain="[('parent_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
32 </page>
33 <page string="Description">
34 <field name="description" nolabel="1" attrs="{'readonly':[('state','=','c')]}"/>