Merge lp:~therp-nl/server-env-tools/view_groups_id_attribution into lp:~therp-nl/server-env-tools/6.1-view_groups_id

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 42
Proposed branch: lp:~therp-nl/server-env-tools/view_groups_id_attribution
Merge into: lp:~therp-nl/server-env-tools/6.1-view_groups_id
Diff against target: 28 lines (+6/-1)
2 files modified
view_groups_id/__openerp__.py (+1/-1)
view_groups_id/model/ir_ui_view.py (+5/-0)
To merge this branch: bzr merge lp:~therp-nl/server-env-tools/view_groups_id_attribution
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Pending
Review via email: mp+170940@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'view_groups_id/__openerp__.py'
2--- view_groups_id/__openerp__.py 2013-06-21 17:01:25 +0000
3+++ view_groups_id/__openerp__.py 2013-06-22 08:55:41 +0000
4@@ -34,7 +34,7 @@
5 Using it for 6.1 modules instead of fields_view_get hacks and the like
6 also lowers the effort it takes to port the module in question to 7.0
7 """,
8- 'author': 'Therp BV',
9+ 'author': ['Therp BV', 'OpenERP SA'],
10 'website': 'http://www.therp.nl',
11 "category": "Dependency",
12 "depends": [
13
14=== modified file 'view_groups_id/model/ir_ui_view.py'
15--- view_groups_id/model/ir_ui_view.py 2013-06-21 17:01:25 +0000
16+++ view_groups_id/model/ir_ui_view.py 2013-06-22 08:55:41 +0000
17@@ -3,6 +3,11 @@
18 #
19 # OpenERP, Open Source Management Solution
20 # This module copyright (C) 2013 Therp BV (<http://therp.nl>)
21+#
22+# Code snippets from openobject-server 7.0
23+# (C) 2004-2012 OpenERP S.A. (<http://openerp.com>)
24+#
25+#
26 # All Rights Reserved
27 #
28 # This program is free software: you can redistribute it and/or modify

Subscribers

People subscribed via source and target branches

to all changes: