Merge lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-fix-1106931 into lp:openerp-mgmtsystem

Proposed by Virgil Dupras
Status: Merged
Merged at revision: 12
Proposed branch: lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-fix-1106931
Merge into: lp:openerp-mgmtsystem
Diff against target: 12 lines (+1/-1)
1 file modified
mgmtsystem_hazard/mgmtsystem_hazard.xml (+1/-1)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-fix-1106931
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Review via email: mp+145408@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_hazard/mgmtsystem_hazard.xml'
2--- mgmtsystem_hazard/mgmtsystem_hazard.xml 2012-08-20 18:34:19 +0000
3+++ mgmtsystem_hazard/mgmtsystem_hazard.xml 2013-01-29 15:40:28 +0000
4@@ -341,7 +341,7 @@
5 <field name="type">form</field>
6 <field name="inherit_id" ref="base.view_company_form"/>
7 <field name="arch" type="xml">
8- <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">
9+ <xpath expr="//page[@string='Configuration']" position="inside">
10 <separator string="Management System"/>
11 <field name="risk_computation_id"/>
12 </xpath>