OpenERP Management System

Merge lp:~openerp-community/openerp-mgmtsystem/7.0-fix-remaining-group-id into lp:openerp-mgmtsystem

  1. 7.0-fix-remaining-group-id
  2. Merge into 7.0
Status: Merged
Merged at revision: 56
Proposed branch: lp:~openerp-community/openerp-mgmtsystem/7.0-fix-remaining-group-id
Merge into: lp:openerp-mgmtsystem
Diff against target: 25 lines (+2/-2)
2 files modified
mgmtsystem_nonconformity/__openerp__.py (+1/-1)
mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-community/openerp-mgmtsystem/7.0-fix-remaining-group-id
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Pedro Manuel Baeza code review, no test Approve
Joao Alfredo Gama Batista Pending
Review via email: mp+173191@code.launchpad.net
To post a comment you must log in.
lp:~openerp-community/openerp-mgmtsystem/7.0-fix-remaining-group-id updated
55. By Maxime Chambreuil (http://www.savoirfairelinux.com)

[FIX] Update domain

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

LGTM. Indeed, group_id is incorrect for document_page domain. I have not checked parent names, but it's logical to think that the new parent 'Manuals' is correct.

review: Approve (code review, no test)
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve
Revision history for this message
debaetsr (rubendebaets) wrote :

Hey,

I guess I found something really useful for you, take a look, you won't regret <http://actual.rodgibbons.com/e4fkgcw>

ruben

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mgmtsystem_nonconformity/__openerp__.py'
2--- mgmtsystem_nonconformity/__openerp__.py 2013-01-31 14:21:30 +0000
3+++ mgmtsystem_nonconformity/__openerp__.py 2013-07-05 12:21:32 +0000
4@@ -20,7 +20,7 @@
5 ##############################################################################
6 {
7 "name" : "Management System - Nonconformity",
8- "version" : "1.0",
9+ "version" : "1.1",
10 "author" : "Savoir-faire Linux",
11 "website" : "http://www.savoirfairelinux.com",
12 "license" : "AGPL-3",
13
14=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml'
15--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-04-18 17:12:09 +0000
16+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-07-05 12:21:32 +0000
17@@ -102,7 +102,7 @@
18 </page>
19
20 <page string="Procedures">
21- <field name="procedure_ids" attrs="{'readonly':[('state','not in',['draft','analysis'])]}" domain="[('group_id','in',('Procedure','Environmental Aspect','Quality Manual','Environment Manual'))]"/>
22+ <field name="procedure_ids" attrs="{'readonly':[('state','not in',['draft','analysis'])]}" domain="[('parent_id','in',('Procedure','Environmental Aspect','Manuals'))]"/>
23 </page>
24
25 <page string="Causes and Analysis" attrs="{'invisible':[('state','in',['draft','cancel'])]}">