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

Proposed by Stefan Rijnhart (Opener) on 2014-05-06
Status: Merged
Merged at revision: 6621
Proposed branch: lp:~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag
Merge into: lp:openupgrade-addons/6.1
Diff against target: 50 lines (+41/-0)
2 files modified
hr_holidays/migrations/6.1.1.5/data.xml (+13/-0)
hr_holidays/migrations/6.1.1.5/post-migration.py (+28/-0)
To merge this branch: bzr merge lp:~therp-nl/openupgrade-addons/lp1316542-hr_holidays_action_tag
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve on 2014-05-12
Pedro Manuel Baeza code review 2014-05-06 Approve on 2014-05-06
Review via email: mp+218385@code.launchpad.net
To post a comment you must log in.
Pedro Manuel Baeza (pedro.baeza) wrote :

Hi, Stephan, thanks for the fix.

I see that removing action from workflow fixes the bug, and the other data is not related, but needed for a perfect migration, so I approve both changes.

Regards.

review: Approve (code review)
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'hr_holidays/migrations/6.1.1.5/data.xml'
2--- hr_holidays/migrations/6.1.1.5/data.xml 1970-01-01 00:00:00 +0000
3+++ hr_holidays/migrations/6.1.1.5/data.xml 2014-05-06 11:10:39 +0000
4@@ -0,0 +1,13 @@
5+<?xml version='1.0' encoding='utf-8'?>
6+<openerp>
7+ <data>
8+ <record model="hr.holidays.status" id="holiday_status_cl"><field name="name">Legal Leaves</field>
9+ </record>
10+ <record model="hr.holidays.status" id="holiday_status_sl"><field name="name">Sick Leaves</field>
11+ </record>
12+ <record model="workflow.activity" id="act_refuse">
13+ <field name="action"/>
14+ </record>
15+ </data>
16+</openerp>
17+
18
19=== added file 'hr_holidays/migrations/6.1.1.5/post-migration.py'
20--- hr_holidays/migrations/6.1.1.5/post-migration.py 1970-01-01 00:00:00 +0000
21+++ hr_holidays/migrations/6.1.1.5/post-migration.py 2014-05-06 11:10:39 +0000
22@@ -0,0 +1,28 @@
23+# -*- coding: utf-8 -*-
24+##############################################################################
25+#
26+# OpenERP, Open Source Management Solution
27+# This module copyright (C) 2014 Therp BV (<http://therp.nl>).
28+#
29+# This program is free software: you can redistribute it and/or modify
30+# it under the terms of the GNU Affero General Public License as
31+# published by the Free Software Foundation, either version 3 of the
32+# License, or (at your option) any later version.
33+#
34+# This program is distributed in the hope that it will be useful,
35+# but WITHOUT ANY WARRANTY; without even the implied warranty of
36+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
37+# GNU Affero General Public License for more details.
38+#
39+# You should have received a copy of the GNU Affero General Public License
40+# along with this program. If not, see <http://www.gnu.org/licenses/>.
41+#
42+##############################################################################
43+from openerp.openupgrade import openupgrade
44+
45+
46+@openupgrade.migrate()
47+def migrate(cr, version):
48+ openupgrade.load_data(
49+ cr, 'hr_holidays',
50+ 'migrations/6.1.1.5/data.xml')

Subscribers

People subscribed via source and target branches