OpenERP Management System

Merge lp:~hsoft/openerp-mgmtsystem/migrate-7.0 into lp:openerp-mgmtsystem

  1. migrate-7.0
  2. Merge into 7.0
Proposed by Virgil Dupras
Status: Merged
Merged at revision: 13
Proposed branch: lp:~hsoft/openerp-mgmtsystem/migrate-7.0
Merge into: lp:openerp-mgmtsystem
Diff against target: 54 lines (+8/-3)
4 files modified
mgmtsystem_audit/mgmtsystem_audit.xml (+3/-1)
mgmtsystem_health_safety/__openerp__.py (+0/-1)
mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml (+3/-1)
mgmtsystem_review/mgmtsystem_review.xml (+2/-0)
To merge this branch: bzr merge lp:~hsoft/openerp-mgmtsystem/migrate-7.0
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp code review, no test Approve
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Review via email: mp+145864@code.launchpad.net

Description of the change

With the fixes on this branch, I can install all modules of mgmtsystem on a clean OpenERP 7.0 install without problems.

I could also add and edit at least one object of each section in Managmenet System, still no problem.

It doesn't mean there aren't bugs, but at least they're not obvious.

To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)

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 2012-08-20 18:34:19 +0000
3+++ mgmtsystem_audit/mgmtsystem_audit.xml 2013-01-31 14:10:30 +0000
4@@ -72,7 +72,9 @@
5 <field name="name" attrs="{'readonly':[('state','=','c')]}"/>
6 <field name="date" attrs="{'readonly':[('state','=','c')]}"/>
7 <field name="reference"/>
8- <field name="system_id"/>
9+ <field name="system_id"/>
10+ <!-- Invisible fields below are to allow their use in domains of this view -->
11+ <field name="state" invisible="1"/>
12 </tree>
13 </field>
14 </record>
15
16=== modified file 'mgmtsystem_health_safety/__openerp__.py'
17--- mgmtsystem_health_safety/__openerp__.py 2012-10-30 20:42:30 +0000
18+++ mgmtsystem_health_safety/__openerp__.py 2013-01-31 14:10:30 +0000
19@@ -42,7 +42,6 @@
20 'mgmtsystem_audit',
21 'mgmtsystem_review',
22 'mgmtsystem_claim',
23- 'letter_mgmt_v6',
24 'document_page_health_safety_manual',
25 'mgmtsystem_hazard',
26 # 'mgmtsystem_equipments',
27
28=== modified file 'mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml'
29--- mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2012-09-18 20:00:17 +0000
30+++ mgmtsystem_nonconformity/mgmtsystem_nonconformity.xml 2013-01-31 14:10:30 +0000
31@@ -19,7 +19,9 @@
32 <field name="description" attrs="{'readonly':[('state','=','c')]}"/>
33 <field name="responsible_user_id" attrs="{'readonly':[('state','=','c')]}"/>
34 <field name="author_user_id" attrs="{'readonly':[('state','=','c')]}"/>
35- <field name="system_id"/>
36+ <field name="system_id"/>
37+ <!-- Invisible fields below are to allow their use in domains of this view -->
38+ <field name="state" invisible="1"/>
39 </tree>
40 </field>
41 </record>
42
43=== modified file 'mgmtsystem_review/mgmtsystem_review.xml'
44--- mgmtsystem_review/mgmtsystem_review.xml 2012-08-20 18:34:19 +0000
45+++ mgmtsystem_review/mgmtsystem_review.xml 2013-01-31 14:10:30 +0000
46@@ -70,6 +70,8 @@
47 <field name="name" attrs="{'readonly':[('state','=','c')]}"/>
48 <field name="date" attrs="{'readonly':[('state','=','c')]}"/>
49 <field name="reference"/>
50+ <!-- Invisible fields below are to allow their use in domains of this view -->
51+ <field name="state" invisible="1"/>
52 </tree>
53 </field>
54 </record>