Merge lp:~therp-nl/openupgrade-addons/6.1-hr_group_attributes into lp:openupgrade-addons/6.1

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 6611
Proposed branch: lp:~therp-nl/openupgrade-addons/6.1-hr_group_attributes
Merge into: lp:openupgrade-addons/6.1
Diff against target: 86 lines (+56/-1)
5 files modified
hr/migrations/6.1.1.1/data/hr_security.xml (+13/-0)
hr/migrations/6.1.1.1/post-migration.py (+1/-0)
purchase/migrations/6.1.1.1/data/purchase_security.xml (+15/-0)
purchase/migrations/6.1.1.1/post-migration.py (+26/-0)
purchase/migrations/6.1.1.1/user_notes.txt (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/openupgrade-addons/6.1-hr_group_attributes
Reviewer Review Type Date Requested Status
OpenUpgrade Committers Pending
Review via email: mp+132267@code.launchpad.net

Description of the change

Additional group attributes for hr and purchase, which load its security definitions with noupdate=True.

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=== added directory 'hr/migrations/6.1.1.1/data'
2=== added file 'hr/migrations/6.1.1.1/data/hr_security.xml'
3--- hr/migrations/6.1.1.1/data/hr_security.xml 1970-01-01 00:00:00 +0000
4+++ hr/migrations/6.1.1.1/data/hr_security.xml 2012-10-31 09:40:27 +0000
5@@ -0,0 +1,13 @@
6+<?xml version="1.0" encoding="utf-8"?>
7+<openerp>
8+ <data noupdate="1">
9+ <record id="base.group_hr_user" model="res.groups">
10+ <field name="category_id" ref="base.module_category_human_resources"/>
11+ <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
12+ </record>
13+ <record id="base.group_hr_manager" model="res.groups">
14+ <field name="category_id" ref="base.module_category_human_resources"/>
15+ <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
16+ </record>
17+ </data>
18+</openerp>
19
20=== modified file 'hr/migrations/6.1.1.1/post-migration.py'
21--- hr/migrations/6.1.1.1/post-migration.py 2012-06-19 09:34:23 +0000
22+++ hr/migrations/6.1.1.1/post-migration.py 2012-10-31 09:40:27 +0000
23@@ -89,3 +89,4 @@
24 'hr_job',
25 openupgrade.get_legacy_name('expected_employees')
26 )])
27+ openupgrade.load_data(cr, 'hr', 'migrations/6.1.1.1/data/hr_security.xml')
28
29=== added directory 'purchase/migrations/6.1.1.1/data'
30=== added file 'purchase/migrations/6.1.1.1/data/purchase_security.xml'
31--- purchase/migrations/6.1.1.1/data/purchase_security.xml 1970-01-01 00:00:00 +0000
32+++ purchase/migrations/6.1.1.1/data/purchase_security.xml 2012-10-31 09:40:27 +0000
33@@ -0,0 +1,15 @@
34+<?xml version="1.0" encoding="utf-8"?>
35+<openerp>
36+ <data noupdate="1">
37+
38+ <record id="group_purchase_user" model="res.groups">
39+ <field name="category_id" ref="base.module_category_purchase_management"/>
40+ </record>
41+
42+ <record id="group_purchase_manager" model="res.groups">
43+ <field name="category_id" ref="base.module_category_purchase_management"/>
44+ <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
45+ </record>
46+
47+ </data>
48+</openerp>
49
50=== added file 'purchase/migrations/6.1.1.1/post-migration.py'
51--- purchase/migrations/6.1.1.1/post-migration.py 1970-01-01 00:00:00 +0000
52+++ purchase/migrations/6.1.1.1/post-migration.py 2012-10-31 09:40:27 +0000
53@@ -0,0 +1,26 @@
54+# -*- coding: utf-8 -*-
55+##############################################################################
56+#
57+# OpenERP, Open Source Management Solution
58+# This module copyright (C) 2012 Therp BV (<http://therp.nl>).
59+#
60+# This program is free software: you can redistribute it and/or modify
61+# it under the terms of the GNU Affero General Public License as
62+# published by the Free Software Foundation, either version 3 of the
63+# License, or (at your option) any later version.
64+#
65+# This program is distributed in the hope that it will be useful,
66+# but WITHOUT ANY WARRANTY; without even the implied warranty of
67+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
68+# GNU Affero General Public License for more details.
69+#
70+# You should have received a copy of the GNU Affero General Public License
71+# along with this program. If not, see <http://www.gnu.org/licenses/>.
72+#
73+##############################################################################
74+
75+from openerp.openupgrade import openupgrade
76+
77+@openupgrade.migrate()
78+def migrate(cr, version):
79+ openupgrade.load_data(cr, 'purchase', 'migrations/6.1.1.1/data/purchase_security.xml')
80
81=== modified file 'purchase/migrations/6.1.1.1/user_notes.txt'
82--- purchase/migrations/6.1.1.1/user_notes.txt 2012-06-12 10:51:34 +0000
83+++ purchase/migrations/6.1.1.1/user_notes.txt 2012-10-31 09:40:27 +0000
84@@ -1,1 +1,1 @@
85-Nothing to do for module 'purchase'
86+Adding additional group attributes to purchase user group

Subscribers

People subscribed via source and target branches