OpenERP Management System

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

  1. 7.0-fix-1215926
  2. Merge into 7.0
Status: Merged
Merged at revision: 75
Proposed branch: lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-fix-1215926
Merge into: lp:openerp-mgmtsystem
Diff against target: 42 lines (+3/-6)
3 files modified
document_page_environmental_aspect/__openerp__.py (+1/-1)
document_page_work_instructions/__openerp__.py (+1/-1)
mgmtsystem_manuals/__openerp__.py (+1/-4)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-mgmtsystem/7.0-fix-1215926
Reviewer Review Type Date Requested Status
Daniel Reis yes! Approve
Review via email: mp+182669@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Reis (dreis-pt) :
review: Approve (yes!)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'document_page_environmental_aspect/__openerp__.py'
2--- document_page_environmental_aspect/__openerp__.py 2013-08-06 16:22:21 +0000
3+++ document_page_environmental_aspect/__openerp__.py 2013-08-28 15:14:32 +0000
4@@ -27,7 +27,7 @@
5 "category" : "Generic Modules/Others",
6 "description": """Environmental Aspects Template, useful for Environment Management System
7 """,
8- "depends" : ['document_page_approval','mgmtsystem'],
9+ "depends" : ['document_page','mgmtsystem'],
10 "data" : ['document_page_environmental_aspect.xml'],
11 "demo" : [],
12 "installable" : True,
13
14=== modified file 'document_page_work_instructions/__openerp__.py'
15--- document_page_work_instructions/__openerp__.py 2013-08-06 16:22:21 +0000
16+++ document_page_work_instructions/__openerp__.py 2013-08-28 15:14:32 +0000
17@@ -27,7 +27,7 @@
18 "category" : "Generic Modules/Others",
19 "description": """Work Instructions Template
20 """,
21- "depends" : ['mgmtsystem','document_page_approval'],
22+ "depends" : ['mgmtsystem','document_page'],
23 "data" : ['document_page_work_instructions.xml'],
24 "demo" : [],
25 "installable" : True,
26
27=== modified file 'mgmtsystem_manuals/__openerp__.py'
28--- mgmtsystem_manuals/__openerp__.py 2013-08-06 16:22:21 +0000
29+++ mgmtsystem_manuals/__openerp__.py 2013-08-28 15:14:32 +0000
30@@ -30,11 +30,8 @@
31 * document_page_environment_manual
32 * document_page_health_safety_manual
33 * mgmtsystem_quality
34-
35-This module requires the document_page_approval module from
36-Knowledge addons project (lp:knowledge-addons).
37 """,
38- "depends" : ['document_page_approval', 'mgmtsystem'],
39+ "depends" : ['document_page', 'mgmtsystem'],
40 "data" : ['mgmtsystem_manuals.xml'],
41 "demo" : [],
42 "installable" : True,